commit 8542fd846d349e758aabe8dcd719f234994a1a85 Author: Petr Písař <ppisar@xxxxxxxxxx> Date: Tue Nov 11 12:58:08 2014 +0100 7.02 bump .gitignore | 1 + ...03-fix_m_strict_to_xsubpp_causes_problems.patch | 88 -------------------- ...xtUtils-MakeMaker-7.02-USE_MM_LD_RUN_PATH.patch | 12 ++-- perl-ExtUtils-MakeMaker.spec | 13 ++-- sources | 2 +- 5 files changed, 14 insertions(+), 102 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0d6ff85..db7b59a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /ExtUtils-MakeMaker-6.96.tar.gz /ExtUtils-MakeMaker-6.98.tar.gz /ExtUtils-MakeMaker-7.00.tar.gz +/ExtUtils-MakeMaker-7.02.tar.gz diff --git a/ExtUtils-MakeMaker-7.00-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-7.02-USE_MM_LD_RUN_PATH.patch similarity index 95% rename from ExtUtils-MakeMaker-7.00-USE_MM_LD_RUN_PATH.patch rename to ExtUtils-MakeMaker-7.02-USE_MM_LD_RUN_PATH.patch index 6b0ea76..72ec0b9 100644 --- a/ExtUtils-MakeMaker-7.00-USE_MM_LD_RUN_PATH.patch +++ b/ExtUtils-MakeMaker-7.02-USE_MM_LD_RUN_PATH.patch @@ -1,4 +1,4 @@ -From 08a3479e2506391d829211ddb716aaaacb263aa4 Mon Sep 17 00:00:00 2001 +From a800c4f9170b7c7c7fd4b16a974ad8c8d37d7f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx> Date: Thu, 12 Jan 2012 17:05:19 +0100 Subject: [PATCH] Do not set RPATH by default @@ -20,7 +20,7 @@ Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx> 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm -index 41a0ccb..0e67404 100644 +index 3a18edf..4cc9890 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,7 +36,7 @@ index 41a0ccb..0e67404 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 9fa6704..44c45d5 100644 +index f0d223f..4526f57 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -970,7 +970,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO @@ -49,7 +49,7 @@ index 9fa6704..44c45d5 100644 } diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm -index b585b99..af8e91c 100644 +index 028925b..86e6d83 100644 --- a/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm @@ -301,7 +301,7 @@ sub full_setup { @@ -61,7 +61,7 @@ index b585b99..af8e91c 100644 XS_VERSION clean depend dist dynamic_lib linkext macro realclean tool_autosplit -@@ -456,7 +456,27 @@ sub new { +@@ -436,7 +436,27 @@ sub new { # PRINT_PREREQ is RedHatism. if ("@ARGV" =~ /\bPRINT_PREREQ\b/) { $self->_PRINT_PREREQ; @@ -90,7 +90,7 @@ index b585b99..af8e91c 100644 print "MakeMaker (v$VERSION)\n" if $Verbose; if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ -@@ -2727,6 +2747,40 @@ precedence. A typemap in the current directory has highest +@@ -2713,6 +2733,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 c454186..c233060 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,9 +1,9 @@ %global cpan_name ExtUtils-MakeMaker -%global cpan_version 7.00 +%global cpan_version 7.02 Name: perl-%{cpan_name} Version: %(echo '%{cpan_version}' | tr _ .) -Release: 2%{?dist} +Release: 1%{?dist} Summary: Create a module Makefile License: GPL+ or Artistic Group: Development/Libraries @@ -11,16 +11,13 @@ 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}-7.00-USE_MM_LD_RUN_PATH.patch +Patch0: %{cpan_name}-7.02-USE_MM_LD_RUN_PATH.patch # Link to libperl.so explicitly. Bug #960048. Patch1: %{cpan_name}-7.00-Link-to-libperl-explicitly-on-Linux.patch # Unbundle version modules Patch2: ExtUtils-MakeMaker-7.00-Unbundle-version.patch # Unbundle Encode::Locale module Patch3: ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch -# Rebuilding EU-MM with xsubpp from perl-5.20 core causes test failure because -# shellbang prologue is not strict-safe, in 7.01_04. -Patch4: ExtUtils-MakeMaker-7.01_03-fix_m_strict_to_xsubpp_causes_problems.patch BuildArch: noarch BuildRequires: perl # Makefile.Pl uses ExtUtils::MakeMaker from ./lib @@ -113,7 +110,6 @@ Dougherty and the perl5-porters. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 # Remove bundled modules rm -rf bundled sed -i -e '/^bundled\// d' MANIFEST @@ -144,6 +140,9 @@ make test %{_mandir}/man3/* %changelog +* Tue Nov 11 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 7.02-1 +- 7.02 bump + * Wed Nov 05 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 7.00-2 - Fix building with older xsubpp diff --git a/sources b/sources index 6cdd627..7eba0e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b56741749a1874a0c65f8e89fc0c501 ExtUtils-MakeMaker-7.00.tar.gz +4e249fb6b148dd89465001f3905a1ead ExtUtils-MakeMaker-7.02.tar.gz -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel