.gitignore

@@ -1 +1 @@
-SOURCES/ExtUtils-MakeMaker-7.34.tar.gz
+SOURCES/ExtUtils-MakeMaker-7.42.tar.gz

.perl-ExtUtils-MakeMaker.metadata

@@ -1 +1 @@
-d0b625774460453a01f3da4bbf8a6f37576ff621 SOURCES/ExtUtils-MakeMaker-7.34.tar.gz
+0441553dc10430917382f132be3dfa167d77a030 SOURCES/ExtUtils-MakeMaker-7.42.tar.gz

SOURCES/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch

@@ -1,4 +1,4 @@
-From 83b4921f10f9df96ec359e20489864080f7b37ca Mon Sep 17 00:00:00 2001
+From 9b80126d33174059a03502521d5cb1fdc9b2c3a1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
 Date: Thu, 12 Jan 2012 17:05:19 +0100
 Subject: [PATCH] Do not set RPATH by default
@@ -14,13 +14,13 @@ See <https://bugzilla.redhat.com/show_bug.cgi?id=773622>.
 
 Signed-off-by: Petr Písař <ppisar@redhat.com>
 ---
- lib/ExtUtils/Liblist.pm   |  5 +++++
+ lib/ExtUtils/Liblist.pm   |  5 ++++
  lib/ExtUtils/MM_Unix.pm   |  2 +-
- lib/ExtUtils/MakeMaker.pm | 56 ++++++++++++++++++++++++++++++++++++++++++++++-
+ lib/ExtUtils/MakeMaker.pm | 56 ++++++++++++++++++++++++++++++++++++++-
  3 files changed, 61 insertions(+), 2 deletions(-)
 
 diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
-index 15eed3c..219e96b 100644
+index 44c4c39..3983194 100644
 --- a/lib/ExtUtils/Liblist.pm
 +++ b/lib/ExtUtils/Liblist.pm
 @@ -89,6 +89,11 @@ libraries.  LD_RUN_PATH is a colon separated list of the directories
@@ -36,10 +36,10 @@ index 15eed3c..219e96b 100644
  
  List of those libraries that are needed but can be linked in
 diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
-index 6233513..198f05e 100644
+index a0a2ee1..dda54bb 100644
 --- a/lib/ExtUtils/MM_Unix.pm
 +++ b/lib/ExtUtils/MM_Unix.pm
-@@ -1045,7 +1045,7 @@ sub xs_make_dynamic_lib {
+@@ -1074,7 +1074,7 @@ sub xs_make_dynamic_lib {
      }
  
      my $ld_run_path_shell = "";
@@ -49,13 +49,13 @@ index 6233513..198f05e 100644
      }
  
 diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
-index 3d4913e..b52c96d 100644
+index 90790d4..f5459eb 100644
 --- a/lib/ExtUtils/MakeMaker.pm
 +++ b/lib/ExtUtils/MakeMaker.pm
 @@ -317,7 +317,7 @@ sub full_setup {
      PERM_DIR PERM_RW PERM_RWX MAGICXS
      PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
-     PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
+     PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ PUREPERL_ONLY
 -    SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS
 +    SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS
      XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION
@@ -88,7 +88,7 @@ index 3d4913e..b52c96d 100644
      print "MakeMaker (v$VERSION)\n" if $Verbose;
      if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
          check_manifest();
-@@ -2797,6 +2817,40 @@ precedence.  A typemap in the current directory has highest
+@@ -2837,6 +2857,40 @@ precedence.  A typemap in the current directory has highest
  precedence, even if it isn't listed in TYPEMAPS.  The default system
  typemap has lowest precedence.
  
@@ -130,5 +130,5 @@ index 3d4913e..b52c96d 100644
  
  Like PERLPREFIX, but only for the vendor install locations.
 -- 
-2.13.6
+2.20.1
 

SPECS/perl-ExtUtils-MakeMaker.spec

@@ -1,16 +1,19 @@
+# Run optional test
+%bcond_without perl_ExtUtils_MakeMaker_enables_optional_test
+
 %global cpan_name ExtUtils-MakeMaker
 
 Name:           perl-%{cpan_name}
-Epoch:          1
-Version:        7.34
+Epoch:          2
+Version:        7.42
 Release:        1%{?dist}
 Summary:        Create a module Makefile
 License:        GPL+ or Artistic
-URL:            http://search.cpan.org/dist/%{cpan_name}/
-Source0:        http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz
+URL:            https://metacpan.org/release/%{cpan_name}
+Source0:        https://cpan.metacpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz
 # Do not set RPATH to perl shared-library modules by default. Bug #773622.
 # This is copy from `perl' package. This is a distributor extension.
-Patch0:         %{cpan_name}-7.30-USE_MM_LD_RUN_PATH.patch
+Patch0:         %{cpan_name}-7.36-USE_MM_LD_RUN_PATH.patch
 # Link to libperl.so explicitly. Bug #960048.
 Patch1:         %{cpan_name}-7.30-Link-to-libperl-explicitly-on-Linux.patch
 # Unbundle version modules
@@ -43,7 +46,6 @@ BuildRequires:  perl(version)
 BuildRequires:  perl(warnings)
 # If an XS module is compiled, xsubpp(1) is needed
 BuildRequires:  perl-ExtUtils-ParseXS
-BuildRequires:  sed
 # Tests:
 BuildRequires:  perl(AutoSplit)
 BuildRequires:  perl(base)
@@ -68,9 +70,11 @@ BuildRequires:  perl(POSIX)
 BuildRequires:  perl(subs)
 BuildRequires:  perl(Test::Harness)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Text::ParseWords)
 # threads::shared not used
 BuildRequires:  perl(utf8)
 # XSLoader not used
+%if %{with perl_ExtUtils_MakeMaker_enables_optional_test}
 # Optional tests
 BuildRequires:  perl-devel
 BuildRequires:  perl(B)
@@ -78,6 +82,7 @@ BuildRequires:  perl(ExtUtils::CBuilder)
 BuildRequires:  perl(PerlIO)
 # Keep YAML optional
 # Keep YAML::Tiny optional
+%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(B)
 Recommends:     perl(CPAN::Meta) >= 2.143240
@@ -104,16 +109,18 @@ Requires:       perl(Pod::Man)
 Requires:       perl(POSIX)
 Requires:       perl(Test::Harness)
 Recommends:     perl(Time::HiRes)
-# Text::ParseWords is not needed (Win32 only)
+Requires:       perl(Text::ParseWords)
 # VMS::Filespec is not needed (VMS only)
 # Win32 is not needed (Win32 only)
 # If an XS module is compiled, xsubpp(1) is needed
 Requires:       perl-ExtUtils-ParseXS
+# These dependencies are weak in order to relieve building noarch
+# packages from perl-devel and gcc. See bug #1547165.
 # If an XS module is built, code generated from XS will be compiled and it
 # includes Perl header files.
-# TODO: This dependency will be weaken in order to relieve building noarch
-# packages from perl-devel and gcc.
-Requires:       perl-devel
+Recommends:     perl-devel
+# If an XS module is built, the generated Makefile executes gcc.
+Recommends:     gcc
 
 # Do not export underspecified dependencies
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(File::Spec\\)\s*$
@@ -163,20 +170,20 @@ is an overkill for small subroutines.
 %patch4 -p1
 # Remove bundled modules
 rm -rf bundled
-sed -i -e '/^bundled\// d' MANIFEST
+perl -i -ne 'print $_ unless m{^bundled/}' MANIFEST
 rm -rf t/lib/Test
-sed -i -e '/^t\/lib\/Test\// d' MANIFEST
+perl -i -ne 'print $_ unless m{^t/lib/Test/}' MANIFEST
 rm -rf lib/ExtUtils/MakeMaker/version{,.pm}
-sed -i -e '/^lib\/ExtUtils\/MakeMaker\/version[\/\.]/ d' MANIFEST
+perl -i -ne 'print $_ unless m{^lib/ExtUtils/MakeMaker/version(?:/|\.pm)}' MANIFEST
 rm -rf lib/ExtUtils/MakeMaker/Locale.pm
-sed -i -e '/^lib\/ExtUtils\/MakeMaker\/Locale\.pm/ d' MANIFEST
+perl -i -ne 'print $_ unless m{^lib/ExtUtils/MakeMaker/Locale\.pm}' MANIFEST
 
 %build
-BUILDING_AS_PACKAGE=1 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
-make %{?_smp_mflags}
+BUILDING_AS_PACKAGE=1 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
@@ -206,9 +213,45 @@ make test
 %{_mandir}/man3/ExtUtils::MM::Utils.*
 
 %changelog
+* Wed Dec 18 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.42-1
+- 7.42 bump
+
+* Tue Dec 17 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.40-1
+- 7.40 bump
+
+* Wed Sep 11 2019 Petr Pisar <ppisar@redhat.com> - 2:7.38-1
+- 7.38 bump
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.36-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.36-3
+- Perl 5.30 re-rebuild of bootstrapped packages
+
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.36-2
+- Perl 5.30 rebuild
+
+* Mon Apr 29 2019 Petr Pisar <ppisar@redhat.com> - 1:7.36-1
+- 7.36 bump
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.34-419
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.34-418
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:7.34-417
+- Perl 5.28 re-rebuild of bootstrapped packages
+
+* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:7.34-416
+- Increase release to favour standalone package
+
 * Mon Mar 19 2018 Petr Pisar <ppisar@redhat.com> - 1:7.34-1
 - 7.34 bump
 
+* Wed Feb 28 2018 Petr Pisar <ppisar@redhat.com> - 1:7.32-2
+- Recommend gcc and perl-devel instead of a hard dependency (bug #1547165)
+
 * Mon Feb 19 2018 Petr Pisar <ppisar@redhat.com> - 1:7.32-1
 - 7.32 bump