6.64 bump

This commit is contained in:
Petr Písař 2012-12-17 10:53:54 +01:00
parent 7ca116b9ff
commit a463624d73
4 changed files with 27 additions and 23 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/ExtUtils-MakeMaker-6.62.tar.gz /ExtUtils-MakeMaker-6.62.tar.gz
/ExtUtils-MakeMaker-6.63_02.tar.gz /ExtUtils-MakeMaker-6.63_02.tar.gz
/ExtUtils-MakeMaker-6.64.tar.gz

View File

@ -1,4 +1,4 @@
From dbc43828283bd5ab150e24a6cd18c778e9763d7f Mon Sep 17 00:00:00 2001 From 79fd2d34bf1bb9a46937d0c6455112839866d22c 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
@ -9,13 +9,13 @@ environment variable to 1.
This is copy from `perl' package. This is copy from `perl' package.
See <https://bugzilla.redhat.com/show_bug.cgi?id=773622>. See <https://bugzilla.redhat.com/show_bug.cgi?id=773622>.
--- ---
lib/ExtUtils/Liblist.pm | 5 ++++ lib/ExtUtils/Liblist.pm | 5 ++++
lib/ExtUtils/MM_Unix.pm | 2 +- lib/ExtUtils/MM_Unix.pm | 2 +-
lib/ExtUtils/MakeMaker.pm | 58 +++++++++++++++++++++++++++++++++++++++++++- lib/ExtUtils/MakeMaker.pm | 58 +++++++++++++++++++++++++++++++++++++++++++++--
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 c560cb5..2bd523c 100644 index 71fef20..3447119 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
@ -31,7 +31,7 @@ index c560cb5..2bd523c 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 764da8c..8ea92bd 100644 index 388192e..d1e2380 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
@@ -945,7 +945,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP). @@ -945,7 +945,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).
@ -44,19 +44,19 @@ index 764da8c..8ea92bd 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 2aadf98..3c83caa 100644 index d040891..93a2850 100644
--- a/lib/ExtUtils/MakeMaker.pm --- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm
@@ -279,7 +279,7 @@ sub full_setup { @@ -281,7 +281,7 @@ sub full_setup {
PERL_SRC PERM_DIR PERM_RW PERM_RWX PERL_SRC PERM_DIR PERM_RW PERM_RWX
PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC
PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
- SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG - SIGN SKIP TEST_REQUIRES TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
+ SIGN SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG + SIGN SKIP TEST_REQUIRES TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
XS_VERSION clean depend dist dynamic_lib linkext macro realclean XS_VERSION clean depend dist dynamic_lib linkext macro realclean
tool_autosplit tool_autosplit
@@ -429,7 +429,27 @@ sub new { @@ -431,7 +431,27 @@ sub new {
# PRINT_PREREQ is RedHatism. # PRINT_PREREQ is RedHatism.
if ("@ARGV" =~ /\bPRINT_PREREQ\b/) { if ("@ARGV" =~ /\bPRINT_PREREQ\b/) {
$self->_PRINT_PREREQ; $self->_PRINT_PREREQ;
@ -83,9 +83,9 @@ index 2aadf98..3c83caa 100644
+ $self->{USE_MM_LD_RUN_PATH}=$v; + $self->{USE_MM_LD_RUN_PATH}=$v;
+ }; + };
print STDOUT "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}){
@@ -2380,6 +2400,40 @@ precedence. A typemap in the current directory has highest @@ -2429,6 +2449,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.
@ -127,5 +127,5 @@ index 2aadf98..3c83caa 100644
Like PERLPREFIX, but only for the vendor install locations. Like PERLPREFIX, but only for the vendor install locations.
-- --
1.7.7.5 1.7.11.7

View File

@ -1,16 +1,17 @@
%global cpan_version 6.63_02 %global cpan_name ExtUtils-MakeMaker
%global cpan_version 6.64
Name: perl-ExtUtils-MakeMaker Name: perl-%{cpan_name}
Version: %(echo '%{cpan_version}' | tr _ .) Version: %(echo '%{cpan_version}' | tr _ .)
Release: 241%{?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/ExtUtils-MakeMaker/ URL: http://search.cpan.org/dist/%{cpan_name}/
Source0: http://www.cpan.org/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-%{cpan_version}.tar.gz Source0: http://www.cpan.org/authors/id/M/MS/MSCHWERN/%{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: %{name}-6.62-USE_MM_LD_RUN_PATH.patch Patch0: %{cpan_name}-6.64-USE_MM_LD_RUN_PATH.patch
BuildArch: noarch BuildArch: noarch
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib # Makefile.Pl uses ExtUtils::MakeMaker from ./lib
BuildRequires: perl(Carp) BuildRequires: perl(Carp)
@ -71,9 +72,8 @@ sed -i -e '/^bundled\// d' MANIFEST
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make pure_install PERL_INSTALL_ROOT=$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 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
%check %check
@ -87,6 +87,9 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Mon Dec 17 2012 Petr Pisar <ppisar@redhat.com> - 6.64-1
- 6.64 bump
* Tue Aug 28 2012 Petr Pisar <ppisar@redhat.com> - 6.63.02-241 * Tue Aug 28 2012 Petr Pisar <ppisar@redhat.com> - 6.63.02-241
- Compute RPM version - Compute RPM version
- Do not build-require itself, the build script runs from ./lib - Do not build-require itself, the build script runs from ./lib

View File

@ -1 +1 @@
cc0e78cafe8cb1428280c27c780b7988 ExtUtils-MakeMaker-6.63_02.tar.gz 852339e7c219263cdfca93a7e2dc210d ExtUtils-MakeMaker-6.64.tar.gz