.gitignore

@@ -1 +1 @@
-SOURCES/Module-Install-1.19.tar.gz
+SOURCES/Module-Install-1.21.tar.gz

.perl-Module-Install.metadata

@@ -1 +1 @@
-6c77b2ec0cd84e07d7c7ae03d1cfa5c21d758f81 SOURCES/Module-Install-1.19.tar.gz
+46fcbf025f735844ea76083bf3f9a4f3486f7fc1 SOURCES/Module-Install-1.21.tar.gz

SPECS/perl-Module-Install.spec

@@ -1,8 +1,15 @@
+# Run optional test
+%if ! (0%{?rhel})
+%bcond_without perl_Module_Install_enables_optional_test
+%else
+%bcond_with perl_Module_Install_enables_optional_test
+%endif
+
 Name:           perl-Module-Install
-Version:        1.19
-Release:        18%{?dist}
+Version:        1.21
+Release:        6%{?dist}
 Summary:        Standalone, extensible Perl module installer
-License:        GPL+ or Artistic
+License:        GPL-1.0-or-later OR Artistic-1.0-Perl
 URL:            https://metacpan.org/release/Module-Install
 Source0:        https://cpan.metacpan.org/authors/id/E/ET/ETHER/Module-Install-%{version}.tar.gz
 # Fix a crash when looking up 5.010 Perl core modules, CPAN RT#71565, proposed
@@ -57,12 +64,11 @@ BuildRequires:  perl(ExtUtils::MM)
 BuildRequires:  perl(Symbol)
 BuildRequires:  perl(Test::More)
 # Optional tests only
-%if 0%{!?perl_bootstrap:1}
+%if %{with perl_Module_Install_enables_optional_test} && 0%{!?perl_bootstrap:1}
 BuildRequires:  perl(Module::Install::AuthorTests)
 BuildRequires:  perl(Module::Install::ExtraTests) >= 0.007
 %endif
 BuildRequires:  perl(utf8)
-Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 Requires:       perl(Archive::Zip) >= 1.37
 Requires:       perl(Carp)
 Requires:       perl(CPAN)
@@ -100,6 +106,9 @@ Requires:       perl(YAML::Tiny) >= 1.38
 %global __requires_exclude %__requires_exclude|^perl\\(File::Spec\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(YAML::Tiny\\)$
 
+# Filter modules bundled for tests
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
+%global __requires_exclude %__requires_exclude|^perl\\(MyTest\\)$
 
 %description
 Module::Install is a package for writing installers for CPAN (or CPAN-like)
@@ -107,9 +116,28 @@ distributions that are clean, simple, minimalist, act in a strictly correct
 manner with ExtUtils::MakeMaker, and will run on any Perl installation
 version 5.005 or newer.
 
+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+%if %{with perl_Module_Install_enables_optional_test} && 0%{!?perl_bootstrap:1}
+Requires:       perl(Module::Install::AuthorTests)
+Requires:       perl(Module::Install::ExtraTests) >= 0.007
+%endif
+Requires:       perl(utf8)
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n Module-Install-%{version}
-%patch0 -p1
+%patch -P0 -p1
+# Help generators to recognize Perl scripts
+for F in `find t -name *.t`; do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
@@ -120,21 +148,81 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 rm -f %{buildroot}/blib/lib/auto/share/dist/Module-Install/dist_file.txt
 %{_fixperms} %{buildroot}/*
 
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/bash
+set -e
+# Some tests write into temporary files/directories. The easiest solution
+# is to copy the tests into a writable directory and execute them from there.
+DIR=$(mktemp -d)
+pushd "$DIR"
+cp -a %{_libexecdir}/%{name}/* ./
+prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
+popd
+rm -rf "$DIR"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+
 %check
+export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
 make test
 
 %files
 %doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/Module*
+%{perl_vendorlib}/inc*
+%{_mandir}/man3/Module::*
+%{_mandir}/man3/inc::*
+
+%files tests
+%{_libexecdir}/%{name}
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.19-18
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.21-6
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.21-5
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed May 03 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.21-1
+- 1.21 bump
+- Package tests
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jun 03 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.19-22
+- Perl 5.36 re-rebuild of bootstrapped packages
+
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.19-21
+- Perl 5.36 rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 24 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.19-18
+- Perl 5.34 re-rebuild of bootstrapped packages
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.19-17
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.19-17
+- Perl 5.34 rebuild
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild