From c25f8019ea2cd32f9ec20701eee26a1c8da27cf8 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sun, 24 Apr 2016 17:11:04 +0100 Subject: [PATCH] Update to 0.103012 - New upstream release 0.103012 - Consider license names without parentheses when scanning text for license - When scanning text for license, put known substrings inside \b..\b - Simplify find command using -delete - Update patch for building with old Test::More versions --- ...ware-License-0.103012-old-Test::More.patch | 34 ++++++++++++++++++- perl-Software-License.spec | 26 ++++++++++---- sources | 2 +- 3 files changed, 53 insertions(+), 9 deletions(-) rename Software-License-0.103011-old-Test::More.patch => Software-License-0.103012-old-Test::More.patch (74%) diff --git a/Software-License-0.103011-old-Test::More.patch b/Software-License-0.103012-old-Test::More.patch similarity index 74% rename from Software-License-0.103011-old-Test::More.patch rename to Software-License-0.103012-old-Test::More.patch index 12c1050..309b128 100644 --- a/Software-License-0.103011-old-Test::More.patch +++ b/Software-License-0.103012-old-Test::More.patch @@ -1,3 +1,19 @@ +--- t/creative_commons.t ++++ t/creative_commons.t +@@ -10,6 +10,8 @@ BEGIN { + or plan skip_all => "requires Software::License::CCpack to test this"; + } + ++plan tests => 1; ++ + { + my $license = Software::License::CC_BY_1_0->new({holder => 'DUMMY'})->notice; + my $pod = "=head1 LICENSE\n\n$license\n=cut\n"; +@@ -19,4 +21,3 @@ BEGIN { + ); + } + +-done_testing; --- t/custom.t +++ t/custom.t @@ -2,7 +2,7 @@ @@ -14,6 +30,22 @@ Yes, spanning more lines and more paragraphs. END_OF_FULLTEXT - +-done_testing; +--- t/guess_license_from_pod.t ++++ t/guess_license_from_pod.t +@@ -3,7 +3,7 @@ + use strict; + use warnings; + +-use Test::More; ++use Test::More tests => 1; + use Software::LicenseUtils; + + { +@@ -32,4 +32,3 @@ LICENSE + ); + } + -done_testing; --- t/guess_meta_license.t +++ t/guess_meta_license.t @@ -76,7 +108,7 @@ -note 'Checking Changes'; +diag 'Checking Changes'; my $changes_file = 'Changes'; - my $newver = '0.103011'; + my $newver = '0.103012'; my $trial_token = '-TRIAL'; @@ -14,8 +14,6 @@ SKIP: { ok(_get_changes($newver), "$changes_file has content for $newver"); diff --git a/perl-Software-License.spec b/perl-Software-License.spec index 65cc34f..53b7370 100644 --- a/perl-Software-License.spec +++ b/perl-Software-License.spec @@ -2,14 +2,14 @@ %global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) Name: perl-Software-License -Version: 0.103011 -Release: 2%{?dist} +Version: 0.103012 +Release: 1%{?dist} Summary: Package that provides templated software licenses License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Software-License/ Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Software-License-%{version}.tar.gz -Patch1: Software-License-0.103011-old-Test::More.patch +Patch1: Software-License-0.103012-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch # Module Build @@ -33,6 +33,11 @@ BuildRequires: perl(File::Spec) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod) BuildRequires: perl(Try::Tiny) +# Optional Tests +%if 0%{!?perl_bootstrap:1} && 0%{?fedora} +BuildRequires: perl(CPAN::Meta) >= 2.120900 +BuildRequires: perl(Software::License::CCpack) +%endif # Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) @@ -52,10 +57,10 @@ perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -%{_fixperms} $RPM_BUILD_ROOT +rm -rf %{buildroot} +make pure_install DESTDIR=%{buildroot} +find %{buildroot} -type f -name .packlist -delete +%{_fixperms} %{buildroot} %check make test @@ -79,6 +84,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Software::LicenseUtils.3* %changelog +* Sun Apr 24 2016 Paul Howarth - 0.103012-1 +- Update to 0.103012 + - Consider license names without parentheses when scanning text for license + - When scanning text for license, put known substrings inside \b..\b +- Simplify find command using -delete +- Update patch for building with old Test::More versions + * Thu Feb 04 2016 Fedora Release Engineering - 0.103011-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 9e668b6..f2ae1f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d79b47a33cb8e5f656cb0f9d6d6817 Software-License-0.103011.tar.gz +7f8b81b2c14fb6958fa5fde5e16849dc Software-License-0.103012.tar.gz