.gitignore

@@ -1 +1 @@
-SOURCES/Software-License-0.103014.tar.gz
+SOURCES/Software-License-0.103012.tar.gz

.perl-Software-License.metadata

@@ -1 +1 @@
-469fb29d865a5830caa757035cd4b28e9c2ac487 SOURCES/Software-License-0.103014.tar.gz
+902b776a2f06bc7036b4c9b64cf6abc85cf2ae01 SOURCES/Software-License-0.103012.tar.gz

SOURCES/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

SPECS/perl-Software-License.spec

@@ -1,30 +1,25 @@
-# Run extra tests
-%if 0%{?fedora} || 0%{?rhel} > 6
-%bcond_without perl_Software_License_enables_extra_test
-%else
-%bcond_with perl_Software_License_enables_extra_test
-%endif
+# We need to patch the test suite if we have an old version of Test::More
+%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
 # Run optional tests
-%if 0%{!?perl_bootstrap:1} && 0%{?fedora}
 %bcond_without perl_Software_License_enables_optional_test
-%else
-%bcond_with perl_Software_License_enables_optional_test
-%endif
 
 Name:           perl-Software-License
-Version:        0.103014
+Version:        0.103012
 Release:        5%{?dist}
 Summary:        Package that provides templated software licenses
 License:        GPL+ or Artistic
-URL:            https://metacpan.org/release/Software-License
-Source0:        https://cpan.metacpan.org/authors/id/L/LE/LEONT/Software-License-%{version}.tar.gz
+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.103012-old-Test::More.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
 # Module Build
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
+BuildRequires:  perl
 BuildRequires:  perl-generators
-BuildRequires:  perl-interpreter
 BuildRequires:  perl(ExtUtils::MakeMaker)
 # Module Runtime
 BuildRequires:  perl(Carp)
@@ -35,22 +30,17 @@ BuildRequires:  perl(Module::Load)
 BuildRequires:  perl(parent)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(Text::Template)
-BuildRequires:  perl(utf8)
 BuildRequires:  perl(warnings)
 # Test Suite
 BuildRequires:  perl(File::Spec)
-BuildRequires:  perl(Test::More) >= 0.88
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Try::Tiny)
-%if %{with perl_Software_License_enables_optional_test}
 # Optional Tests
+%if 0%{!?perl_bootstrap:1} && 0%{?fedora} && %{with perl_Software_License_enables_optional_test}
 BuildRequires:  perl(CPAN::Meta) >= 2.120900
 BuildRequires:  perl(Software::License::CCpack)
 %endif
-%if %{with perl_Software_License_enables_extra_test}
-# Extra Tests
-BuildRequires:  perl(Encode)
-BuildRequires:  perl(Test::Pod)
-%endif
 # Runtime
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
@@ -60,21 +50,30 @@ Software-License contains templates for common open source software licenses.
 %prep
 %setup -q -n Software-License-%{version}
 
+# Compatibility with old Test::More versions
+%if %{old_test_more}
+%patch1
+%endif
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -delete
-%{_fixperms} -c %{buildroot}
+%{_fixperms} %{buildroot}
 
 %check
 make test
-%if %{with perl_Software_License_enables_extra_test}
+%if 0%{?fedora} || 0%{?rhel} > 6
 make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
 %endif
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
 %if 0%{?_licensedir:1}
 %license LICENSE
@@ -88,56 +87,8 @@ make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
 %{_mandir}/man3/Software::LicenseUtils.3*
 
 %changelog
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.103014-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.103014-4
-- Perl 5.30 re-rebuild of bootstrapped packages
-
-* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.103014-3
-- Perl 5.30 rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.103014-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Nov 28 2018 Paul Howarth <paul@city-fan.org> - 0.103014-1
-- Update to 0.103014
-  - Added SPDX license expression support
-- This release by LEONT → update source URL
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.103013-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sun Jul 01 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.103013-4
-- Perl 5.28 re-rebuild of bootstrapped packages
-
-* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.103013-3
-- Perl 5.28 rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.103013-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Oct 30 2017 Paul Howarth <paul@city-fan.org> - 0.103013-1
-- Update to 0.103013
-  - guess_license_from_pod() now knows about Software::License::CC0_1_0
-  - Enable "v" as a version word
-  - Improve FreeBSD (2-Clause) phrases
-  - Added EUPL v1.1 and v1.2
-- This release by LEONT → update source URL
-- Drop EL-5 support
-  - Drop BuildRoot: and Group: tags
-  - Drop explicit buildroot cleaning in %%install section
-  - Drop explicit %%clean section
-  - Drop workaround for building with Test::More < 0.88
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.103012-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 0.103012-6
-- Perl 5.26 re-rebuild of bootstrapped packages
-
-* Mon Jun 05 2017 Jitka Plesnikova <jplesnik@redhat.com> - 0.103012-5
-- Perl 5.26 rebuild
+* Fri Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.103012-5
+- Rebuild with enable hardening (bug #1636329)
 
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.103012-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild