diff --git a/.gitignore b/.gitignore index d61da8a..cfcd6bb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /ExtUtils-MakeMaker-6.64.tar.gz /ExtUtils-MakeMaker-6.66.tar.gz /ExtUtils-MakeMaker-6.68.tar.gz +/ExtUtils-MakeMaker-6.72.tar.gz diff --git a/ExtUtils-MakeMaker-6.68-Link-to-libperl-explicitly-on-Linux.patch b/ExtUtils-MakeMaker-6.72-Link-to-libperl-explicitly-on-Linux.patch similarity index 86% rename from ExtUtils-MakeMaker-6.68-Link-to-libperl-explicitly-on-Linux.patch rename to ExtUtils-MakeMaker-6.72-Link-to-libperl-explicitly-on-Linux.patch index 6892ca7..9497d76 100644 --- a/ExtUtils-MakeMaker-6.68-Link-to-libperl-explicitly-on-Linux.patch +++ b/ExtUtils-MakeMaker-6.72-Link-to-libperl-explicitly-on-Linux.patch @@ -1,7 +1,7 @@ -From 5d4dec01bcfafa55d9200f7b02ebbd65367ad34d Mon Sep 17 00:00:00 2001 +From a1fe52f21edba0abf0b3cae4c826cadd3ac714c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 2 Jul 2013 10:28:15 +0200 -Subject: [PATCH] Link to libperl explicitly on Linux +Subject: [PATCH 2/2] Link to libperl explicitly on Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,7 +15,7 @@ Signed-off-by: Petr Písař 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm -index 8796346..12c6e9f 100644 +index 8fafcdf..e645940 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -31,6 +31,7 @@ BEGIN { @@ -26,7 +26,7 @@ index 8796346..12c6e9f 100644 $Is{SunOS4} = $^O eq 'sunos'; $Is{Solaris} = $^O eq 'solaris'; $Is{SunOS} = $Is{SunOS4} || $Is{Solaris}; -@@ -932,7 +933,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). +@@ -936,7 +937,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). my $libs = '$(LDLOADLIBS)'; @@ -35,7 +35,7 @@ index 8796346..12c6e9f 100644 # Use nothing on static perl platforms, and to the flags needed # to link against the shared libperl library on shared perl # platforms. We peek at lddlflags to see if we need -Wl,-R -@@ -941,6 +942,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). +@@ -945,6 +946,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). $libs .= ' -L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -Wl,-R$(PERL_ARCHLIB)/CORE -lperl'; } elsif ($Config{'lddlflags'} =~ /-R/) { $libs .= ' -L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -R$(PERL_ARCHLIB)/CORE -lperl'; diff --git a/ExtUtils-MakeMaker-6.68-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-6.72-USE_MM_LD_RUN_PATH.patch similarity index 94% rename from ExtUtils-MakeMaker-6.68-USE_MM_LD_RUN_PATH.patch rename to ExtUtils-MakeMaker-6.72-USE_MM_LD_RUN_PATH.patch index 59763e2..8c0b277 100644 --- a/ExtUtils-MakeMaker-6.68-USE_MM_LD_RUN_PATH.patch +++ b/ExtUtils-MakeMaker-6.72-USE_MM_LD_RUN_PATH.patch @@ -1,7 +1,7 @@ -From dfe5d4e6ffa4ba2cc88c2e3d1fc69723a2dc7231 Mon Sep 17 00:00:00 2001 +From 9a930b03b89379dda183b289bcf9a6e38a404cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 12 Jan 2012 17:05:19 +0100 -Subject: [PATCH] Do not set RPATH by default +Subject: [PATCH 1/2] Do not set RPATH by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -20,7 +20,7 @@ Signed-off-by: Petr Písař 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm -index 9abb959..b256ca1 100644 +index fb6ea97..659f504 100644 --- a/lib/ExtUtils/Liblist.pm +++ b/lib/ExtUtils/Liblist.pm @@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories @@ -36,10 +36,10 @@ index 9abb959..b256ca1 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 36397bf..ac1fece 100644 +index 110d665..8fafcdf 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm -@@ -945,7 +945,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). +@@ -949,7 +949,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). } my $ld_run_path_shell = ""; @@ -49,7 +49,7 @@ index 36397bf..ac1fece 100644 } diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm -index 7ca7c2c..c1948bd 100644 +index 692f86f..3d3893f 100644 --- a/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm @@ -281,7 +281,7 @@ sub full_setup { @@ -90,7 +90,7 @@ index 7ca7c2c..c1948bd 100644 print "MakeMaker (v$VERSION)\n" if $Verbose; if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ -@@ -2445,6 +2465,40 @@ precedence. A typemap in the current directory has highest +@@ -2471,6 +2491,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. diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index 6f4fd5e..8693200 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,9 +1,9 @@ %global cpan_name ExtUtils-MakeMaker -%global cpan_version 6.68 +%global cpan_version 6.72 Name: perl-%{cpan_name} Version: %(echo '%{cpan_version}' | tr _ .) -Release: 5%{?dist} +Release: 1%{?dist} Summary: Create a module Makefile License: GPL+ or Artistic Group: Development/Libraries @@ -11,9 +11,9 @@ URL: http://search.cpan.org/dist/%{cpan_name}/ Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{cpan_version}.tar.gz # Do not set RPATH to perl shared-library modules by default. Bug #773622. # This is copy from `perl' package. This is distributor extension. -Patch0: %{cpan_name}-6.68-USE_MM_LD_RUN_PATH.patch +Patch0: %{cpan_name}-6.72-USE_MM_LD_RUN_PATH.patch # Link to libperl.so explicitly. Bug #960048. -Patch1: %{cpan_name}-6.68-Link-to-libperl-explicitly-on-Linux.patch +Patch1: %{cpan_name}-6.72-Link-to-libperl-explicitly-on-Linux.patch BuildArch: noarch BuildRequires: perl # Makefile.Pl uses ExtUtils::MakeMaker from ./lib @@ -98,6 +98,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Aug 05 2013 Petr Pisar - 6.72-1 +- 6.72 bump + * Sat Aug 03 2013 Fedora Release Engineering - 6.68-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 989e3f3..832d6c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8afd7a2796d1dd64ef9d2b995e7eab6 ExtUtils-MakeMaker-6.68.tar.gz +78bdc7a3a1aaa3c0412a39233fcc847a ExtUtils-MakeMaker-6.72.tar.gz