commit 18c10198ae58d0249f9cddfacd0f7c003e2b2e61
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Mon Oct 27 15:37:15 2014 +0100
7.00 bump
.gitignore | 1 +
...-7.00-Link-to-libperl-explicitly-on-Linux.patch | 30 +++++------
...xtUtils-MakeMaker-7.00-USE_MM_LD_RUN_PATH.patch | 24 +++++-----
...ils-MakeMaker-7.00-Unbundle-Encode-Locale.patch | 33 ++++++++++++
ExtUtils-MakeMaker-7.00-Unbundle-version.patch | 29 +++++++++++
perl-ExtUtils-MakeMaker.spec | 53 +++++++++++++-------
sources | 2 +-
7 files changed, 125 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f56057b..0d6ff85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/ExtUtils-MakeMaker-6.94.tar.gz
/ExtUtils-MakeMaker-6.96.tar.gz
/ExtUtils-MakeMaker-6.98.tar.gz
+/ExtUtils-MakeMaker-7.00.tar.gz
diff --git a/ExtUtils-MakeMaker-6.88-Link-to-libperl-explicitly-on-Linux.patch b/ExtUtils-MakeMaker-7.00-Link-to-libperl-explicitly-on-Linux.patch
similarity index 74%
rename from ExtUtils-MakeMaker-6.88-Link-to-libperl-explicitly-on-Linux.patch
rename to ExtUtils-MakeMaker-7.00-Link-to-libperl-explicitly-on-Linux.patch
index ea6c552..a6bcf10 100644
--- a/ExtUtils-MakeMaker-6.88-Link-to-libperl-explicitly-on-Linux.patch
+++ b/ExtUtils-MakeMaker-7.00-Link-to-libperl-explicitly-on-Linux.patch
@@ -1,4 +1,4 @@
-From 58d583f98d3730f1f75389f7d25f6079cab91357 Mon Sep 17 00:00:00 2001
+From a5967d84cedc7422bf9f52fe5d035140d58ac134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
Date: Tue, 2 Jul 2013 10:28:15 +0200
Subject: [PATCH] Link to libperl explicitly on Linux
@@ -11,11 +11,11 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
---
- lib/ExtUtils/MM_Unix.pm | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
+ lib/ExtUtils/MM_Unix.pm | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
-index a889217..0896ea5 100644
+index 44c45d5..27ba9e7 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -31,6 +31,7 @@ BEGIN {
@@ -26,7 +26,7 @@ index a889217..0896ea5 100644
$Is{SunOS4} = $^O eq 'sunos';
$Is{Solaris} = $^O eq 'solaris';
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
-@@ -934,7 +935,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
+@@ -953,7 +954,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
my $libs = '$(LDLOADLIBS)';
@@ -35,20 +35,18 @@ index a889217..0896ea5 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
-@@ -947,7 +948,12 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
+@@ -966,6 +967,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
# The Android linker will not recognize symbols from
# libperl unless the module explicitly depends on it.
- $libs .= ' -L$(PERL_INC) -lperl';
-- }
-+ } else {
-+ if ($ENV{PERL_CORE}) {
-+ $libs .= ' -L$(PERL_INC)';
-+ }
-+ $libs .= ' -lperl';
-+ }
+ $libs .= ' "-L$(PERL_INC)" -lperl';
++ } else {
++ if ($ENV{PERL_CORE}) {
++ $libs .= ' -L$(PERL_INC)';
++ }
++ $libs .= ' -lperl';
+ }
}
- my $ld_run_path_shell = "";
--
-1.8.5.3
+1.9.3
diff --git a/ExtUtils-MakeMaker-6.96-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-7.00-USE_MM_LD_RUN_PATH.patch
similarity index 89%
rename from ExtUtils-MakeMaker-6.96-USE_MM_LD_RUN_PATH.patch
rename to ExtUtils-MakeMaker-7.00-USE_MM_LD_RUN_PATH.patch
index 91620ed..6b0ea76 100644
--- a/ExtUtils-MakeMaker-6.96-USE_MM_LD_RUN_PATH.patch
+++ b/ExtUtils-MakeMaker-7.00-USE_MM_LD_RUN_PATH.patch
@@ -1,4 +1,4 @@
-From c0256394ba183a734e8c30babb328682ae1a5055 Mon Sep 17 00:00:00 2001
+From 08a3479e2506391d829211ddb716aaaacb263aa4 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 dbdfc6d..9ff7ead 100644
+index 41a0ccb..0e67404 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 dbdfc6d..9ff7ead 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 99d6148..f74705e 100644
+index 9fa6704..44c45d5 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
-@@ -951,7 +951,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
+@@ -970,7 +970,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
}
my $ld_run_path_shell = "";
@@ -49,19 +49,19 @@ index 99d6148..f74705e 100644
}
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
-index d92bbcb..65b56b1 100644
+index b585b99..af8e91c 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
-@@ -282,7 +282,7 @@ sub full_setup {
- PERL_SRC PERM_DIR PERM_RW PERM_RWX MAGICXS
- PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC PPM_UNINSTALL_EXEC
- PPM_INSTALL_SCRIPT PPM_UNINSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
+@@ -301,7 +301,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
- SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS XSOPT XSPROTOARG
+ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
XS_VERSION clean depend dist dynamic_lib linkext macro realclean
tool_autosplit
-@@ -432,7 +432,27 @@ sub new {
+@@ -456,7 +456,27 @@ sub new {
# PRINT_PREREQ is RedHatism.
if ("@ARGV" =~ /\bPRINT_PREREQ\b/) {
$self->_PRINT_PREREQ;
@@ -90,7 +90,7 @@ index d92bbcb..65b56b1 100644
print "MakeMaker (v$VERSION)\n" if $Verbose;
if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){
-@@ -2641,6 +2661,40 @@ precedence. A typemap in the current directory has highest
+@@ -2727,6 +2747,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.
@@ -132,5 +132,5 @@ index d92bbcb..65b56b1 100644
Like PERLPREFIX, but only for the vendor install locations.
--
-1.9.0
+1.9.3
diff --git a/ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch b/ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
new file mode 100644
index 0000000..fafe623
--- /dev/null
+++ b/ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
@@ -0,0 +1,33 @@
+From 04664fb41a3eaa5bc688c4095107486f8c6d2f4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
+Date: Mon, 27 Oct 2014 16:55:18 +0100
+Subject: [PATCH] Unbundle Encode::Locale
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
+---
+ lib/ExtUtils/MakeMaker.pm | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
+index 04ec5a3..759c079 100644
+--- a/lib/ExtUtils/MakeMaker.pm
++++ b/lib/ExtUtils/MakeMaker.pm
+@@ -10,9 +10,9 @@ use ExtUtils::MakeMaker::Config;
+ use version; # ensure we always have version.pm
+ use Carp;
+ use File::Path;
+-my $CAN_DECODE = eval { require ExtUtils::MakeMaker::Locale; }; # 2 birds, 1 stone
+-eval { ExtUtils::MakeMaker::Locale::reinit('UTF-8') }
+- if $CAN_DECODE and $ExtUtils::MakeMaker::Locale::ENCODING_LOCALE eq 'US-ASCII';
++my $CAN_DECODE = eval { require Encode::Locale; }; # 2 birds, 1 stone
++eval { Encode::Locale::reinit('UTF-8') }
++ if $CAN_DECODE and $Encode::Locale::ENCODING_LOCALE eq 'US-ASCII';
+
+ our $Verbose = 0; # exported
+ our @Parent; # needs to be localized
+--
+1.9.3
+
diff --git a/ExtUtils-MakeMaker-7.00-Unbundle-version.patch b/ExtUtils-MakeMaker-7.00-Unbundle-version.patch
new file mode 100644
index 0000000..273b42d
--- /dev/null
+++ b/ExtUtils-MakeMaker-7.00-Unbundle-version.patch
@@ -0,0 +1,29 @@
+From 6085b732dd43dfa3402f1c98ff0595453cd3ece9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
+Date: Mon, 27 Oct 2014 16:11:38 +0100
+Subject: [PATCH] Unbundle version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
+---
+ lib/ExtUtils/MakeMaker.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
+index af8e91c..04ec5a3 100644
+--- a/lib/ExtUtils/MakeMaker.pm
++++ b/lib/ExtUtils/MakeMaker.pm
+@@ -7,7 +7,7 @@ BEGIN {require 5.006;}
+
+ require Exporter;
+ use ExtUtils::MakeMaker::Config;
+-use ExtUtils::MakeMaker::version; # ensure we always have or fake version.pm
++use version; # ensure we always have version.pm
+ use Carp;
+ use File::Path;
+ my $CAN_DECODE = eval { require ExtUtils::MakeMaker::Locale; }; # 2 birds, 1 stone
+--
+1.9.3
+
diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec
index 536b0ae..e1f8403 100644
--- a/perl-ExtUtils-MakeMaker.spec
+++ b/perl-ExtUtils-MakeMaker.spec
@@ -1,9 +1,9 @@
%global cpan_name ExtUtils-MakeMaker
-%global cpan_version 6.98
+%global cpan_version 7.00
Name: perl-%{cpan_name}
Version: %(echo '%{cpan_version}' | tr _ .)
-Release: 311%{?dist}
+Release: 1%{?dist}
Summary: Create a module Makefile
License: GPL+ or Artistic
Group: Development/Libraries
@@ -11,15 +11,20 @@ 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.96-USE_MM_LD_RUN_PATH.patch
+Patch0: %{cpan_name}-7.00-USE_MM_LD_RUN_PATH.patch
# Link to libperl.so explicitly. Bug #960048.
-Patch1: %{cpan_name}-6.88-Link-to-libperl-explicitly-on-Linux.patch
+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
BuildArch: noarch
BuildRequires: perl
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib
BuildRequires: perl(Carp)
BuildRequires: perl(Config)
BuildRequires: perl(Cwd)
+BuildRequires: perl(Encode)
BuildRequires: perl(Exporter)
BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Path)
@@ -27,11 +32,10 @@ BuildRequires: perl(File::Spec) >= 0.8
BuildRequires: perl(lib)
BuildRequires: perl(strict)
BuildRequires: perl(vars)
+BuildRequires: perl(version)
BuildRequires: perl(warnings)
# If an XS module is compiled, xsubpp(1) is needed
BuildRequires: perl-ExtUtils-ParseXS
-# Unbundled
-BuildRequires: perl(File::Copy::Recursive)
# Tests:
BuildRequires: perl(AutoSplit)
BuildRequires: perl(base)
@@ -39,26 +43,25 @@ BuildRequires: perl(CPAN::Meta)
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(DirHandle)
BuildRequires: perl(DynaLoader)
-BuildRequires: perl(ExtUtils::Command)
-BuildRequires: perl(ExtUtils::Install)
+BuildRequires: perl(ExtUtils::Command) >= 1.16
+BuildRequires: perl(ExtUtils::Install) >= 1.52
BuildRequires: perl(ExtUtils::Installed)
-BuildRequires: perl(ExtUtils::Manifest)
+BuildRequires: perl(ExtUtils::Manifest) >= 1.65
BuildRequires: perl(File::Find)
-BuildRequires: perl(File::Temp)
+BuildRequires: perl(File::Temp) >= 0.22
BuildRequires: perl(Getopt::Long)
BuildRequires: perl(IO::File)
# IO::Handle not used
BuildRequires: perl(less)
BuildRequires: perl(overload)
-BuildRequires: perl(Parse::CPAN::Meta)
+BuildRequires: perl(Parse::CPAN::Meta) >= 1.4400
BuildRequires: perl(Pod::Man)
BuildRequires: perl(POSIX)
-BuildRequires: perl(Scalar::Util)
+BuildRequires: perl(Scalar::Util) >= 1.13
BuildRequires: perl(subs)
BuildRequires: perl(Test::Harness)
BuildRequires: perl(Test::More)
# threads::shared not used
-BuildRequires: perl(version)
# XSLoader not used
# Optional tests
BuildRequires: perl(ExtUtils::CBuilder)
@@ -69,9 +72,12 @@ Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
# CPAN::Meta is optional
Requires: perl(Data::Dumper)
Requires: perl(DynaLoader)
-Requires: perl(ExtUtils::Command)
-Requires: perl(ExtUtils::Install)
-Requires: perl(ExtUtils::Manifest)
+# Encode is needed for producing POD with =encoding statement
+Requires: perl(Encode)
+# Keep unbundled Encode::Locale optional, it's not in the core
+Requires: perl(ExtUtils::Command) >= 1.16
+Requires: perl(ExtUtils::Install) >= 1.52
+Requires: perl(ExtUtils::Manifest) >= 1.65
# ExtUtils::XSSymSet is not needed (VMS only)
Requires: perl(File::Find)
Requires: perl(File::Spec) >= 0.8
@@ -102,12 +108,20 @@ Dougherty and the perl5-porters.
%setup -q -n ExtUtils-MakeMaker-%{cpan_version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
# Remove bundled modules
rm -rf bundled/* ||:
sed -i -e '/^bundled\// d' MANIFEST
+rm -rf t/lib/Test ||:
+sed -i -e '/^t\/lib\/Test\// d' MANIFEST
+rm -rf lib/ExtUtils/MakeMaker/version{,.pm} ||:
+sed -i -e '/^lib\/ExtUtils\/MakeMaker\/version[\/\.]/ d' MANIFEST
+rm -rf lib/ExtUtils/MakeMaker/Locale.pm ||:
+sed -i -e '/^lib\/ExtUtils\/MakeMaker\/Locale\.pm/ d' MANIFEST
%build
-perl Makefile.PL INSTALLDIRS=vendor
+BUILDING_AS_PACKAGE=1 perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
@@ -119,13 +133,16 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
make test
%files
-%doc Changes NOTES PATCHING README TODO
+%doc Changes CONTRIBUTING NOTES README
%{_bindir}/*
%{perl_vendorlib}/*
%{_mandir}/man1/*
%{_mandir}/man3/*
%changelog
+* Mon Oct 27 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 7.00-1
+- 7.00 bump
+
* Fri Oct 24 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 6.98-311
- Require perl-ExtUtils-ParseXS because of xsubpp
diff --git a/sources b/sources
index c28a9ea..6cdd627 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eb83b59e33159ecc700bf60ac3c357a ExtUtils-MakeMaker-6.98.tar.gz
+9b56741749a1874a0c65f8e89fc0c501 ExtUtils-MakeMaker-7.00.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
