rpms
/
perl-ExtUtils-MakeMaker
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7.04 bump

This commit is contained in:
Petr Písař 2014-12-05 13:16:02 +01:00
parent 09b21878cd
commit 10cdd3c43a
6 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,3 +19,4 @@
/ExtUtils-MakeMaker-6.98.tar.gz /ExtUtils-MakeMaker-6.98.tar.gz
/ExtUtils-MakeMaker-7.00.tar.gz /ExtUtils-MakeMaker-7.00.tar.gz
/ExtUtils-MakeMaker-7.02.tar.gz /ExtUtils-MakeMaker-7.02.tar.gz
/ExtUtils-MakeMaker-7.04.tar.gz

8
ExtUtils-MakeMaker-7.00-Link-to-libperl-explicitly-on-Linux.patch → ExtUtils-MakeMaker-7.04-Link-to-libperl-explicitly-on-Linux.patch
View File

@ -1,4 +1,4 @@
From a5967d84cedc7422bf9f52fe5d035140d58ac134 Mon Sep 17 00:00:00 2001 From 2f3b92290fd492e9155bbc60b959316e7c704e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Tue, 2 Jul 2013 10:28:15 +0200 Date: Tue, 2 Jul 2013 10:28:15 +0200
Subject: [PATCH] Link to libperl explicitly on Linux Subject: [PATCH] Link to libperl explicitly on Linux
@ -15,7 +15,7 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
1 file changed, 7 insertions(+), 1 deletion(-) 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 44c45d5..27ba9e7 100644 index 8e07011..8cdcb85 100644
--- a/lib/ExtUtils/MM_Unix.pm --- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm
@@ -31,6 +31,7 @@ BEGIN { @@ -31,6 +31,7 @@ BEGIN {
@ -26,7 +26,7 @@ index 44c45d5..27ba9e7 100644
$Is{SunOS4} = $^O eq 'sunos'; $Is{SunOS4} = $^O eq 'sunos';
$Is{Solaris} = $^O eq 'solaris'; $Is{Solaris} = $^O eq 'solaris';
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris}; $Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
@@ -953,7 +954,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO @@ -955,7 +956,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
my $libs = '$(LDLOADLIBS)'; my $libs = '$(LDLOADLIBS)';
@ -35,7 +35,7 @@ index 44c45d5..27ba9e7 100644
# Use nothing on static perl platforms, and to the flags needed # Use nothing on static perl platforms, and to the flags needed
# to link against the shared libperl library on shared perl # to link against the shared libperl library on shared perl
# platforms. We peek at lddlflags to see if we need -Wl,-R # platforms. We peek at lddlflags to see if we need -Wl,-R
@@ -966,6 +967,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO @@ -968,6 +969,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
# The Android linker will not recognize symbols from # The Android linker will not recognize symbols from
# libperl unless the module explicitly depends on it. # libperl unless the module explicitly depends on it.
$libs .= ' "-L$(PERL_INC)" -lperl'; $libs .= ' "-L$(PERL_INC)" -lperl';

12
ExtUtils-MakeMaker-7.02-USE_MM_LD_RUN_PATH.patch → ExtUtils-MakeMaker-7.04-USE_MM_LD_RUN_PATH.patch
View File

@ -1,4 +1,4 @@
From a800c4f9170b7c7c7fd4b16a974ad8c8d37d7f4f Mon Sep 17 00:00:00 2001 From 28f0571bcdd3ab678d60d7a755572a114f46c03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 12 Jan 2012 17:05:19 +0100 Date: Thu, 12 Jan 2012 17:05:19 +0100
Subject: [PATCH] Do not set RPATH by default Subject: [PATCH] Do not set RPATH by default
@ -20,7 +20,7 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
3 files changed, 62 insertions(+), 3 deletions(-) 3 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
index 3a18edf..4cc9890 100644 index 85ebbf5..ec8ec21 100644
--- a/lib/ExtUtils/Liblist.pm --- a/lib/ExtUtils/Liblist.pm
+++ b/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 @@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories
@ -36,10 +36,10 @@ index 3a18edf..4cc9890 100644
List of those libraries that are needed but can be linked in 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 diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index f0d223f..4526f57 100644 index 4ec32a3..8e07011 100644
--- a/lib/ExtUtils/MM_Unix.pm --- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm
@@ -970,7 +970,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO @@ -972,7 +972,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
} }
my $ld_run_path_shell = ""; my $ld_run_path_shell = "";
@ -49,7 +49,7 @@ index f0d223f..4526f57 100644
} }
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 028925b..86e6d83 100644 index df5acdf..1a5f045 100644
--- a/lib/ExtUtils/MakeMaker.pm --- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm
@@ -301,7 +301,7 @@ sub full_setup { @@ -301,7 +301,7 @@ sub full_setup {
@ -90,7 +90,7 @@ index 028925b..86e6d83 100644
print "MakeMaker (v$VERSION)\n" if $Verbose; print "MakeMaker (v$VERSION)\n" if $Verbose;
if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){ if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){
@@ -2713,6 +2733,40 @@ precedence. A typemap in the current directory has highest @@ -2714,6 +2734,40 @@ precedence. A typemap in the current directory has highest
precedence, even if it isn't listed in TYPEMAPS. The default system precedence, even if it isn't listed in TYPEMAPS. The default system
typemap has lowest precedence. typemap has lowest precedence.

6
ExtUtils-MakeMaker-7.00-Unbundle-version.patch → ExtUtils-MakeMaker-7.04-Unbundle-version.patch
View File

@ -1,4 +1,4 @@
From 6085b732dd43dfa3402f1c98ff0595453cd3ece9 Mon Sep 17 00:00:00 2001 From dd4d8926703b8be0e94aae15a5d574992be20dbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 27 Oct 2014 16:11:38 +0100 Date: Mon, 27 Oct 2014 16:11:38 +0100
Subject: [PATCH] Unbundle version Subject: [PATCH] Unbundle version
@ -12,14 +12,14 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index af8e91c..04ec5a3 100644 index 1a5f045..71c3751 100644
--- a/lib/ExtUtils/MakeMaker.pm --- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm
@@ -7,7 +7,7 @@ BEGIN {require 5.006;} @@ -7,7 +7,7 @@ BEGIN {require 5.006;}
require Exporter; require Exporter;
use ExtUtils::MakeMaker::Config; use ExtUtils::MakeMaker::Config;
-use ExtUtils::MakeMaker::version; # ensure we always have or fake version.pm -use ExtUtils::MakeMaker::version; # ensure we always have our fake version.pm
+use version; # ensure we always have version.pm +use version; # ensure we always have version.pm
use Carp; use Carp;
use File::Path; use File::Path;

13
perl-ExtUtils-MakeMaker.spec
View File

@ -1,5 +1,5 @@
%global cpan_name ExtUtils-MakeMaker %global cpan_name ExtUtils-MakeMaker
%global cpan_version 7.02 %global cpan_version 7.04
Name: perl-%{cpan_name} Name: perl-%{cpan_name}
Version: %(echo '%{cpan_version}' | tr _ .) Version: %(echo '%{cpan_version}' | tr _ .)
@ -11,11 +11,11 @@ URL: http://search.cpan.org/dist/%{cpan_name}/
Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{cpan_version}.tar.gz 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. # Do not set RPATH to perl shared-library modules by default. Bug #773622.
# This is copy from `perl' package. This is distributor extension. # This is copy from `perl' package. This is distributor extension.
Patch0: %{cpan_name}-7.02-USE_MM_LD_RUN_PATH.patch Patch0: %{cpan_name}-7.04-USE_MM_LD_RUN_PATH.patch
# Link to libperl.so explicitly. Bug #960048. # Link to libperl.so explicitly. Bug #960048.
Patch1: %{cpan_name}-7.00-Link-to-libperl-explicitly-on-Linux.patch Patch1: %{cpan_name}-7.04-Link-to-libperl-explicitly-on-Linux.patch
# Unbundle version modules # Unbundle version modules
Patch2: ExtUtils-MakeMaker-7.00-Unbundle-version.patch Patch2: ExtUtils-MakeMaker-7.04-Unbundle-version.patch
# Unbundle Encode::Locale module # Unbundle Encode::Locale module
Patch3: ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch Patch3: ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
# Cope with missing Encode::Locale, CPAN RT#100268 # Cope with missing Encode::Locale, CPAN RT#100268
@ -74,7 +74,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
# CPAN::Meta is optional # CPAN::Meta is optional
Requires: perl(Data::Dumper) Requires: perl(Data::Dumper)
Requires: perl(DynaLoader) Requires: perl(DynaLoader)
# Encode is needed for producing POD with =encoding statement # Encode is needed for producing POD with =encoding statement correctly
Requires: perl(Encode) Requires: perl(Encode)
# Keep unbundled Encode::Locale optional, it's not in the core # Keep unbundled Encode::Locale optional, it's not in the core
Requires: perl(ExtUtils::Command) >= 1.16 Requires: perl(ExtUtils::Command) >= 1.16
@ -143,6 +143,9 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Fri Dec 05 2014 Petr Pisar <ppisar@redhat.com> - 7.04-1
- 7.04 bump
* Tue Nov 11 2014 Petr Pisar <ppisar@redhat.com> - 7.02-1 * Tue Nov 11 2014 Petr Pisar <ppisar@redhat.com> - 7.02-1
- 7.02 bump - 7.02 bump
- Cope with missing Encode::Locale - Cope with missing Encode::Locale

2
sources
View File

@ -1 +1 @@
4e249fb6b148dd89465001f3905a1ead ExtUtils-MakeMaker-7.02.tar.gz c280fa6a0dfe1d21d6b42792c041ddf7 ExtUtils-MakeMaker-7.04.tar.gz