2 changed files with 74 additions and 60 deletions
--- a/SOURCES/Package-Generator-1.106-old-Test::More.patch
+++ b/SOURCES/Package-Generator-1.106-old-Test::More.patch
@ -0,0 +1,52 @@
+--- t/000-report-versions-tiny.t
+++ t/000-report-versions-tiny.t
+@@ -1,12 +1,6 @@
+ use strict;
+ use warnings;
+-use Test::More 0.88;
+-# This is a relatively nice way to avoid Test::NoWarnings breaking our
+-# expectations by adding extra tests, without using no_plan.  It also helps
+-# avoid any other test module that feels introducing random tests, or even
+-# test plans, is a nice idea.
+-our $success = 0;
+-END { $success && done_testing; }
+use Test::More tests => 1;
+ 
+ # List our own version used to generate this
+ my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.10\n";
+@@ -52,7 +46,7 @@ eval { $v .= pmver('Carp','any version')
+ eval { $v .= pmver('ExtUtils::MakeMaker','6.30') };
+ eval { $v .= pmver('Scalar::Util','any version') };
+ eval { $v .= pmver('Symbol','any version') };
+-eval { $v .= pmver('Test::More','0.96') };
+eval { $v .= pmver('Test::More','0.47') };
+ eval { $v .= pmver('strict','any version') };
+ eval { $v .= pmver('warnings','any version') };
+ 
+@@ -68,7 +62,6 @@ EOT
+ 
+ diag($v);
+ ok(1, "we really didn't test anything, just reporting data");
+-$success = 1;
+ 
+ # Work around another nasty module on CPAN. :/
+ no warnings 'once';
+--- xt/release/changes_has_content.t
+++ xt/release/changes_has_content.t
+@@ -2,7 +2,6 @@
+ 
+ use Test::More tests => 2;
+ 
+-note 'Checking Changes';
+ my $changes_file = 'Changes';
+ my $newver = '1.106';
+ my $trial_token = '-TRIAL';
+@@ -14,8 +13,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
--- a/SPECS/perl-Package-Generator.spec
+++ b/SPECS/perl-Package-Generator.spec
@ -1,3 +1,5 @@
+# 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 extra test
 %if ! (0%{?rhel})
 %bcond_without perl_Package_Generator_enables_extra_test
@ -7,30 +9,26 @@

 Name:		perl-Package-Generator
 Version:	1.106
-Release:	23%{?dist}
+Release:	12%{?dist}
 Summary:	Generate new packages quickly and easily
 License:	GPL+ or Artistic
-URL:		https://metacpan.org/release/Package-Generator
-Source0:	https://cpan.metacpan.org/modules/by-module/Package/Package-Generator-%{version}.tar.gz
+Group:		Development/Libraries
+URL:		http://search.cpan.org/dist/Package-Generator/
+Source0:	http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Package-Generator-%{version}.tar.gz
+Patch1:		Package-Generator-1.106-old-Test::More.patch
 BuildArch:	noarch
 # Module Build
-BuildRequires:	coreutils
-BuildRequires:	findutils
-BuildRequires:	make
 BuildRequires:	perl-generators
-BuildRequires:	perl-interpreter
 BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.30
 # Module
 BuildRequires:	perl(Carp)
 BuildRequires:	perl(Scalar::Util)
-BuildRequires:	perl(strict)
-BuildRequires:	perl(warnings)
 # Test Suite
 BuildRequires:	perl(Params::Util) >= 0.11
-BuildRequires:	perl(Test::More) >= 0.96
+BuildRequires:	perl(Test::More) >= 0.47
 %if %{with perl_Package_Generator_enables_extra_test}
 # Extra Tests
-BuildRequires:	perl(Test::Pod) >= 1.41
+BuildRequires:	perl(Test::Pod)
 %endif
 # Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@ -42,14 +40,20 @@ them unused names and sets up their package data, if provided.
 %prep
 %setup -q -n Package-Generator-%{version}

+# We need to patch the test suite if we have an old version of Test::More
+%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}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+%{_fixperms} %{buildroot}

 %check
 make test
@ -58,56 +62,14 @@ make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
 %endif

 %files
-%license LICENSE
-%doc Changes README
+%doc Changes LICENSE README
 %{perl_vendorlib}/Package/
-%{_mandir}/man3/Package::Generator.3*
-%{_mandir}/man3/Package::Reaper.3*
+%{_mandir}/man3/Package::Generator.3pm*
+%{_mandir}/man3/Package::Reaper.3pm*

 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.106-23
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.106-22
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.106-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 13 2021 Paul Howarth <paul@city-fan.org> - 1.106-20
- Spec tidy-up
-  - Use author-independent source URL
-  - Specify all build requirements
-  - Drop support for building with Test::More < 0.88
-  - Drop redundant buildroot cleaning in %%install section
-  - Simplify find command using -delete
-  - Fix permissions verbosely
-  - Use %%license macro
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.106-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.106-18
- Perl 5.32 rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.106-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.106-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.106-15
- Perl 5.30 rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.106-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.106-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.106-12
- Perl 5.28 rebuild
+* Fri Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.106-12
+- Rebuild with enable hardening (bug #1636329)

 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.106-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild