7.12 bump
This commit is contained in:
parent
d56ed2d24a
commit
adba686e51
1
.gitignore
vendored
1
.gitignore
vendored
@ -23,3 +23,4 @@
|
|||||||
/ExtUtils-MakeMaker-7.06.tar.gz
|
/ExtUtils-MakeMaker-7.06.tar.gz
|
||||||
/ExtUtils-MakeMaker-7.08.tar.gz
|
/ExtUtils-MakeMaker-7.08.tar.gz
|
||||||
/ExtUtils-MakeMaker-7.10.tar.gz
|
/ExtUtils-MakeMaker-7.10.tar.gz
|
||||||
|
/ExtUtils-MakeMaker-7.12.tar.gz
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 37785fd42cd049a2465f01adf0db39545157e0f3 Mon Sep 17 00:00:00 2001
|
From c2fc4b379565552ba6c82553ceceb7d4cd754cc5 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,10 +15,10 @@ 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 94293c7..b31f36f 100644
|
index 25a1778..fcd130a 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 {
|
@@ -30,6 +30,7 @@ BEGIN {
|
||||||
$Is{IRIX} = $^O eq 'irix';
|
$Is{IRIX} = $^O eq 'irix';
|
||||||
$Is{NetBSD} = $^O eq 'netbsd';
|
$Is{NetBSD} = $^O eq 'netbsd';
|
||||||
$Is{Interix} = $^O eq 'interix';
|
$Is{Interix} = $^O eq 'interix';
|
||||||
@ -26,16 +26,16 @@ index 94293c7..b31f36f 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};
|
||||||
@@ -955,7 +956,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
|
@@ -1022,7 +1023,7 @@ sub xs_make_dynamic_lib {
|
||||||
|
push(@m," \$(RM_F) \$\@\n");
|
||||||
|
|
||||||
my $libs = '$(LDLOADLIBS)';
|
my $libs = '$(LDLOADLIBS)';
|
||||||
|
|
||||||
- if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
|
- if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
|
||||||
+ if (($Is{Linux} || $Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
|
+ if (($Is{Linux} || $Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
|
||||||
# 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
|
||||||
@@ -968,6 +969,11 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
|
@@ -1035,6 +1036,11 @@ sub xs_make_dynamic_lib {
|
||||||
# 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';
|
||||||
@ -48,5 +48,5 @@ index 94293c7..b31f36f 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.4.3
|
2.5.5
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 17e693f3dbd9deb458882e30ff7bfaebce54d90b Mon Sep 17 00:00:00 2001
|
From 23c9f1c141e5c3026f53108eb1e740da1d6a7d0a 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,10 +20,10 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|||||||
3 files changed, 61 insertions(+), 2 deletions(-)
|
3 files changed, 61 insertions(+), 2 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 7522150..f5b4ede 100644
|
index 4144bae..5e9c287 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
|
@@ -89,6 +89,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories
|
||||||
in LDLOADLIBS. It is passed as an environment variable to the process
|
in LDLOADLIBS. It is passed as an environment variable to the process
|
||||||
that links the shared library.
|
that links the shared library.
|
||||||
|
|
||||||
@ -36,10 +36,10 @@ index 7522150..f5b4ede 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 3f2cd9d..94293c7 100644
|
index 4fa03ed..25a1778 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
|
||||||
@@ -972,7 +972,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
|
@@ -1039,7 +1039,7 @@ sub xs_make_dynamic_lib {
|
||||||
}
|
}
|
||||||
|
|
||||||
my $ld_run_path_shell = "";
|
my $ld_run_path_shell = "";
|
||||||
@ -49,19 +49,19 @@ index 3f2cd9d..94293c7 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 226f405..f96aaa0 100644
|
index d9d0942..446b39d 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 {
|
@@ -313,7 +313,7 @@ sub full_setup {
|
||||||
PERM_DIR PERM_RW PERM_RWX MAGICXS
|
PERM_DIR PERM_RW PERM_RWX MAGICXS
|
||||||
PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
|
PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
|
||||||
PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
|
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 VERSION VERSION_FROM XS
|
||||||
+ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
|
+ SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS
|
||||||
XS_VERSION clean depend dist dynamic_lib linkext macro realclean
|
XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION
|
||||||
tool_autosplit
|
clean depend dist dynamic_lib linkext macro realclean tool_autosplit
|
||||||
|
|
||||||
@@ -438,6 +438,26 @@ sub new {
|
@@ -490,6 +490,26 @@ sub new {
|
||||||
$self->_PRINT_PREREQ;
|
$self->_PRINT_PREREQ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -88,7 +88,7 @@ index 226f405..f96aaa0 100644
|
|||||||
print "MakeMaker (v$VERSION)\n" if $Verbose;
|
print "MakeMaker (v$VERSION)\n" if $Verbose;
|
||||||
if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
|
if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
|
||||||
check_manifest();
|
check_manifest();
|
||||||
@@ -2711,6 +2731,40 @@ precedence. A typemap in the current directory has highest
|
@@ -2771,6 +2791,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.
|
||||||
|
|
||||||
@ -130,5 +130,5 @@ index 226f405..f96aaa0 100644
|
|||||||
|
|
||||||
Like PERLPREFIX, but only for the vendor install locations.
|
Like PERLPREFIX, but only for the vendor install locations.
|
||||||
--
|
--
|
||||||
2.4.3
|
2.5.5
|
||||||
|
|
@ -1,19 +1,19 @@
|
|||||||
%global cpan_name ExtUtils-MakeMaker
|
%global cpan_name ExtUtils-MakeMaker
|
||||||
%global cpan_version 7.10
|
%global cpan_version 7.12
|
||||||
|
|
||||||
Name: perl-%{cpan_name}
|
Name: perl-%{cpan_name}
|
||||||
Version: %(echo '%{cpan_version}' | tr _ .)
|
Version: %(echo '%{cpan_version}' | tr _ .)
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Create a module Makefile
|
Summary: Create a module Makefile
|
||||||
License: GPL+ or Artistic
|
License: GPL+ or Artistic
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://search.cpan.org/dist/%{cpan_name}/
|
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 a distributor extension.
|
||||||
Patch0: %{cpan_name}-7.08-USE_MM_LD_RUN_PATH.patch
|
Patch0: %{cpan_name}-7.12-USE_MM_LD_RUN_PATH.patch
|
||||||
# Link to libperl.so explicitly. Bug #960048.
|
# Link to libperl.so explicitly. Bug #960048.
|
||||||
Patch1: %{cpan_name}-7.08-Link-to-libperl-explicitly-on-Linux.patch
|
Patch1: %{cpan_name}-7.12-Link-to-libperl-explicitly-on-Linux.patch
|
||||||
# Unbundle version modules
|
# Unbundle version modules
|
||||||
Patch2: %{cpan_name}-7.04-Unbundle-version.patch
|
Patch2: %{cpan_name}-7.04-Unbundle-version.patch
|
||||||
# Unbundle Encode::Locale module
|
# Unbundle Encode::Locale module
|
||||||
@ -25,9 +25,12 @@ BuildRequires: coreutils
|
|||||||
BuildRequires: findutils
|
BuildRequires: findutils
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: perl
|
BuildRequires: perl
|
||||||
|
BuildRequires: perl-generators
|
||||||
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib
|
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib
|
||||||
|
# B needed only for CPAN::Meta::Requirements
|
||||||
BuildRequires: perl(Carp)
|
BuildRequires: perl(Carp)
|
||||||
BuildRequires: perl(Config)
|
BuildRequires: perl(Config)
|
||||||
|
# CPAN::Meta::Requirements has a fallback
|
||||||
BuildRequires: perl(Cwd)
|
BuildRequires: perl(Cwd)
|
||||||
BuildRequires: perl(Encode)
|
BuildRequires: perl(Encode)
|
||||||
BuildRequires: perl(Exporter)
|
BuildRequires: perl(Exporter)
|
||||||
@ -46,13 +49,12 @@ BuildRequires: sed
|
|||||||
# Tests:
|
# Tests:
|
||||||
BuildRequires: perl(AutoSplit)
|
BuildRequires: perl(AutoSplit)
|
||||||
BuildRequires: perl(base)
|
BuildRequires: perl(base)
|
||||||
BuildRequires: perl(CPAN::Meta)
|
BuildRequires: perl(CPAN::Meta) >= 2.143240
|
||||||
BuildRequires: perl(Data::Dumper)
|
BuildRequires: perl(Data::Dumper)
|
||||||
BuildRequires: perl(DirHandle)
|
|
||||||
BuildRequires: perl(DynaLoader)
|
BuildRequires: perl(DynaLoader)
|
||||||
BuildRequires: perl(ExtUtils::Install) >= 1.52
|
BuildRequires: perl(ExtUtils::Install) >= 1.52
|
||||||
# ExtUtils::Installed not used at tests
|
# ExtUtils::Installed not used at tests
|
||||||
BuildRequires: perl(ExtUtils::Manifest) >= 1.65
|
BuildRequires: perl(ExtUtils::Manifest) >= 1.70
|
||||||
# ExtUtils::Packlist not used at tests
|
# ExtUtils::Packlist not used at tests
|
||||||
# ExtUtils::XSSymSet is not needed (VMS only)
|
# ExtUtils::XSSymSet is not needed (VMS only)
|
||||||
BuildRequires: perl(File::Find)
|
BuildRequires: perl(File::Find)
|
||||||
@ -62,10 +64,9 @@ BuildRequires: perl(Getopt::Long)
|
|||||||
# IO::Handle not used
|
# IO::Handle not used
|
||||||
BuildRequires: perl(less)
|
BuildRequires: perl(less)
|
||||||
BuildRequires: perl(overload)
|
BuildRequires: perl(overload)
|
||||||
BuildRequires: perl(Parse::CPAN::Meta) >= 1.4400
|
BuildRequires: perl(Parse::CPAN::Meta) >= 1.4414
|
||||||
BuildRequires: perl(Pod::Man)
|
BuildRequires: perl(Pod::Man)
|
||||||
BuildRequires: perl(POSIX)
|
BuildRequires: perl(POSIX)
|
||||||
BuildRequires: perl(Scalar::Util) >= 1.13
|
|
||||||
BuildRequires: perl(subs)
|
BuildRequires: perl(subs)
|
||||||
BuildRequires: perl(Test::Harness)
|
BuildRequires: perl(Test::Harness)
|
||||||
BuildRequires: perl(Test::More)
|
BuildRequires: perl(Test::More)
|
||||||
@ -80,26 +81,29 @@ BuildRequires: perl(PerlIO)
|
|||||||
# Keep YAML::Tiny optional
|
# Keep YAML::Tiny optional
|
||||||
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
|
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
|
||||||
Requires: perl(B)
|
Requires: perl(B)
|
||||||
Recommends: perl(CPAN::Meta) >= 2.112150
|
Recommends: perl(CPAN::Meta) >= 2.143240
|
||||||
|
Suggests: perl(CPAN::Meta::Converter) >= 2.141170
|
||||||
|
# CPAN::Meta::Requirements to support version ranges
|
||||||
|
Recommends: perl(CPAN::Meta::Requirements) >= 2.130
|
||||||
Requires: perl(Data::Dumper)
|
Requires: perl(Data::Dumper)
|
||||||
Requires: perl(DynaLoader)
|
Requires: perl(DynaLoader)
|
||||||
# Encode is needed for producing POD with =encoding statement correctly
|
# Encode is needed for producing POD with =encoding statement correctly
|
||||||
Requires: perl(Encode)
|
Requires: perl(Encode)
|
||||||
Recommends: perl(Encode::Locale)
|
Recommends: perl(Encode::Locale)
|
||||||
Requires: perl(ExtUtils::Command) >= 1.19
|
Requires: perl(ExtUtils::Command) >= 1.19
|
||||||
Requires: perl(ExtUtils::Install) >= 1.52
|
Requires: perl(ExtUtils::Install) >= 1.54
|
||||||
Requires: perl(ExtUtils::Manifest) >= 1.65
|
Requires: perl(ExtUtils::Manifest) >= 1.70
|
||||||
# ExtUtils::XSSymSet is not needed (VMS only)
|
# ExtUtils::XSSymSet is not needed (VMS only)
|
||||||
Requires: perl(File::Find)
|
Requires: perl(File::Find)
|
||||||
Requires: perl(File::Spec) >= 0.8
|
Requires: perl(File::Spec) >= 0.8
|
||||||
Requires: perl(Getopt::Long)
|
Requires: perl(Getopt::Long)
|
||||||
|
Suggests: perl(JSON::PP)
|
||||||
# Optional Pod::Man is needed for generating manual pages from POD
|
# Optional Pod::Man is needed for generating manual pages from POD
|
||||||
Requires: perl(Pod::Man)
|
Requires: perl(Pod::Man)
|
||||||
Requires: perl(POSIX)
|
Requires: perl(POSIX)
|
||||||
Requires: perl(Test::Harness)
|
Requires: perl(Test::Harness)
|
||||||
Recommends: perl(Time::HiRes)
|
Recommends: perl(Time::HiRes)
|
||||||
# Text::ParseWords is not needed (Win32 only)
|
# Text::ParseWords is not needed (Win32 only)
|
||||||
Requires: perl(version)
|
|
||||||
# VMS::Filespec is not needed (VMS only)
|
# VMS::Filespec is not needed (VMS only)
|
||||||
# Win32 is not needed (Win32 only)
|
# Win32 is not needed (Win32 only)
|
||||||
# If an XS module is compiled, xsubpp(1) is needed
|
# If an XS module is compiled, xsubpp(1) is needed
|
||||||
@ -174,7 +178,7 @@ make %{?_smp_mflags}
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
make pure_install DESTDIR=$RPM_BUILD_ROOT
|
make pure_install DESTDIR=$RPM_BUILD_ROOT
|
||||||
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
|
find $RPM_BUILD_ROOT -type f -name .packlist -delete
|
||||||
%{_fixperms} $RPM_BUILD_ROOT/*
|
%{_fixperms} $RPM_BUILD_ROOT/*
|
||||||
|
|
||||||
%check
|
%check
|
||||||
@ -204,6 +208,9 @@ make test
|
|||||||
%{_mandir}/man3/ExtUtils::MM::Utils.*
|
%{_mandir}/man3/ExtUtils::MM::Utils.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 20 2016 Petr Pisar <ppisar@redhat.com> - 7.12-1
|
||||||
|
- 7.12 bump
|
||||||
|
|
||||||
* Tue Apr 19 2016 Petr Pisar <ppisar@redhat.com> - 7.10-5
|
* Tue Apr 19 2016 Petr Pisar <ppisar@redhat.com> - 7.10-5
|
||||||
- Own ExtUtils/MM directory by perl-ExtUtils-MM-Utils only
|
- Own ExtUtils/MM directory by perl-ExtUtils-MM-Utils only
|
||||||
- Require perl-devel by perl-ExtUtils-MakeMaker
|
- Require perl-devel by perl-ExtUtils-MakeMaker
|
||||||
|
Loading…
Reference in New Issue
Block a user