From c25f8019ea2cd32f9ec20701eee26a1c8da27cf8 Mon Sep 17 00:00:00 2001
From: Paul Howarth <p...@city-fan.org>
Date: Sun, 24 Apr 2016 17:11:04 +0100
Subject: 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
---
Software-License-0.103011-old-Test::More.patch | 89 ------------------
Software-License-0.103012-old-Test::More.patch | 121 +++++++++++++++++++++++++
perl-Software-License.spec | 26 ++++--
sources | 2 +-
4 files changed, 141 insertions(+), 97 deletions(-)
delete mode 100644 Software-License-0.103011-old-Test::More.patch
create mode 100644 Software-License-0.103012-old-Test::More.patch
diff --git a/Software-License-0.103011-old-Test::More.patch
b/Software-License-0.103011-old-Test::More.patch
deleted file mode 100644
index 12c1050..0000000
--- a/Software-License-0.103011-old-Test::More.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- t/custom.t
-+++ t/custom.t
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
-
--use Test::More;
-+use Test::More tests => 8;
-
- use Software::License::Custom;
-
-@@ -40,5 +40,3 @@ Well... this is only some sample text. I
-
- Yes, spanning more lines and more paragraphs.
- END_OF_FULLTEXT
--
--done_testing;
---- t/guess_meta_license.t
-+++ t/guess_meta_license.t
-@@ -64,4 +64,3 @@ is_deeply(
- [ ],
- );
-
--done_testing;
---- t/meta-names.t
-+++ t/meta-names.t
-@@ -2,13 +2,16 @@
- use strict;
- use warnings;
-
--use Test::More 0.88;
-+use Test::More;
-
- my @files = <lib/Software/License/*.pm>;
-
-+plan tests => scalar @files;
-+
- for my $module (@files) {
- # It's retired. Dunno if it's okay to be open_source. Punt!
-- next if $module =~ /Sun.pm$/;
-+ SKIP: {
-+ skip "Dunno if it's okay for Sun.pm to be open_source", 1 if $module =~
/Sun.pm$/;
-
- my $pkg = $module;
- $pkg =~ s{^lib/}{};
-@@ -18,6 +21,5 @@ for my $module (@files) {
- eval "require $pkg; 1";
-
- ok(defined $pkg->meta_name, "$pkg provide meta_name");
-+ }
- }
--
--done_testing;
---- t/two-dots.t
-+++ t/two-dots.t
-@@ -32,6 +32,8 @@ my @licenses = qw(
- Zlib
- );
-
-+plan tests => 3 * scalar(@licenses);
-+
- for my $l (@licenses) {
- my $class = 'Software::License::' . $l;
- require_ok($class);
-@@ -48,4 +50,3 @@ for my $l (@licenses) {
- );
- }
-
--done_testing;
---- xt/release/changes_has_content.t
-+++ xt/release/changes_has_content.t
-@@ -2,7 +2,7 @@
-
- use Test::More tests => 2;
-
--note 'Checking Changes';
-+diag 'Checking Changes';
- my $changes_file = 'Changes';
- my $newver = '0.103011';
- my $trial_token = '-TRIAL';
-@@ -14,8 +14,6 @@ SKIP: {
- ok(_get_changes($newver), "$changes_file has content for $newver");
- }
-
--done_testing;
--
- # _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit
- # by Jerome Quelin
- sub _get_changes
diff --git a/Software-License-0.103012-old-Test::More.patch
b/Software-License-0.103012-old-Test::More.patch
new file mode 100644
index 0000000..309b128
--- /dev/null
+++ b/Software-License-0.103012-old-Test::More.patch
@@ -0,0 +1,121 @@
+--- 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 @@
+ use strict;
+ use warnings;
+
+-use Test::More;
++use Test::More tests => 8;
+
+ use Software::License::Custom;
+
+@@ -40,5 +40,3 @@ Well... this is only some sample text. I
+
+ 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
+@@ -64,4 +64,3 @@ is_deeply(
+ [ ],
+ );
+
+-done_testing;
+--- t/meta-names.t
++++ t/meta-names.t
+@@ -2,13 +2,16 @@
+ use strict;
+ use warnings;
+
+-use Test::More 0.88;
++use Test::More;
+
+ my @files = <lib/Software/License/*.pm>;
+
++plan tests => scalar @files;
++
+ for my $module (@files) {
+ # It's retired. Dunno if it's okay to be open_source. Punt!
+- next if $module =~ /Sun.pm$/;
++ SKIP: {
++ skip "Dunno if it's okay for Sun.pm to be open_source", 1 if $module =~
/Sun.pm$/;
+
+ my $pkg = $module;
+ $pkg =~ s{^lib/}{};
+@@ -18,6 +21,5 @@ for my $module (@files) {
+ eval "require $pkg; 1";
+
+ ok(defined $pkg->meta_name, "$pkg provide meta_name");
++ }
+ }
+-
+-done_testing;
+--- t/two-dots.t
++++ t/two-dots.t
+@@ -32,6 +32,8 @@ my @licenses = qw(
+ Zlib
+ );
+
++plan tests => 3 * scalar(@licenses);
++
+ for my $l (@licenses) {
+ my $class = 'Software::License::' . $l;
+ require_ok($class);
+@@ -48,4 +50,3 @@ for my $l (@licenses) {
+ );
+ }
+
+-done_testing;
+--- xt/release/changes_has_content.t
++++ xt/release/changes_has_content.t
+@@ -2,7 +2,7 @@
+
+ use Test::More tests => 2;
+
+-note 'Checking Changes';
++diag 'Checking Changes';
+ my $changes_file = 'Changes';
+ my $newver = '0.103012';
+ my $trial_token = '-TRIAL';
+@@ -14,8 +14,6 @@ SKIP: {
+ ok(_get_changes($newver), "$changes_file has content for $newver");
+ }
+
+-done_testing;
+-
+ # _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit
+ # by Jerome Quelin
+ sub _get_changes
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 <p...@city-fan.org> - 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 <rel...@fedoraproject.org> -
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
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-Software-License.git/commit/?h=master&id=c25f8019ea2cd32f9ec20701eee26a1c8da27cf8
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
