rpms/perl-ExtUtils-MakeMaker
7
0
Fork 0
Code Issues Pull Requests Releases Activity

7.06 bump

Browse Source
This commit is contained in:
Petr Písař 2015-09-01 10:16:47 +02:00
parent 6523222f98
commit 9a557da02e
6 changed files with 83 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -20,3 +20,4 @@
/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 /ExtUtils-MakeMaker-7.04.tar.gz
/ExtUtils-MakeMaker-7.06.tar.gz

36
ExtUtils-MakeMaker-7.02-Write-UTF-8-encoded-chunk-if-Locale-Encode-is-not-av.patch
View File

@ -1,36 +0,0 @@
From 8907d813767b9b15426826693762fa7542afedc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Tue, 11 Nov 2014 14:30:08 +0100
Subject: [PATCH] Write UTF-8-encoded chunk if Locale::Encode is not available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
CPAN RT#100268
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/ExtUtils/MakeMaker.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 86e6d83..248e8f4 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -1195,11 +1195,11 @@ sub flush {
binmode $fh, ':encoding(locale)' if $CAN_DECODE;
for my $chunk (@{$self->{RESULT}}) {
- my $to_write = "$chunk\n";
+ my $to_write = "$chunk";
if (!$CAN_DECODE && $] > 5.008) {
utf8::encode $to_write;
}
- print $fh "$chunk\n"
+ print $fh "$to_write\n"
or die "Can't write to MakeMaker.tmp: $!";
}
--
1.9.3

12
ExtUtils-MakeMaker-7.04-Link-to-libperl-explicitly-on-Linux.patch → ExtUtils-MakeMaker-7.06-Link-to-libperl-explicitly-on-Linux.patch
View File

@ -1,4 +1,4 @@
From 2f3b92290fd492e9155bbc60b959316e7c704e87 Mon Sep 17 00:00:00 2001 From 92de778d11258fb26185cb6b7258e2dcf6d43b99 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 8e07011..8cdcb85 100644 index 38d780a..8440388 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,16 +26,16 @@ index 8e07011..8cdcb85 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 @@ -1016,7 +1017,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 @@ -1029,6 +1030,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 8e07011..8cdcb85 100644
} }
-- --
1.9.3 2.4.3

28
ExtUtils-MakeMaker-7.04-USE_MM_LD_RUN_PATH.patch → ExtUtils-MakeMaker-7.06-USE_MM_LD_RUN_PATH.patch
View File

@ -1,4 +1,4 @@
From 28f0571bcdd3ab678d60d7a755572a114f46c03d Mon Sep 17 00:00:00 2001 From 7710f58f372a097887831999c1d724b381492f21 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, 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 85ebbf5..ec8ec21 100644 index 0d00242..b451c37 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 85ebbf5..ec8ec21 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 4ec32a3..8e07011 100644 index f6ed5e6..38d780a 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 @@ -1033,7 +1033,7 @@ sub xs_make_dynamic_lib {
} }
my $ld_run_path_shell = ""; my $ld_run_path_shell = "";
@ -49,19 +49,19 @@ index 4ec32a3..8e07011 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 df5acdf..1a5f045 100644 index 01e906f..bc82b54 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 { @@ -312,7 +312,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
@@ -436,7 +436,27 @@ sub new { @@ -478,7 +478,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;
@ -90,7 +90,7 @@ index df5acdf..1a5f045 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}){
@@ -2714,6 +2734,40 @@ precedence. A typemap in the current directory has highest @@ -2760,6 +2780,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.
@ -132,5 +132,5 @@ index df5acdf..1a5f045 100644
Like PERLPREFIX, but only for the vendor install locations. Like PERLPREFIX, but only for the vendor install locations.
-- --
1.9.3 2.4.3

75
perl-ExtUtils-MakeMaker.spec
View File

@ -1,9 +1,9 @@
%global cpan_name ExtUtils-MakeMaker %global cpan_name ExtUtils-MakeMaker
%global cpan_version 7.04 %global cpan_version 7.06
Name: perl-%{cpan_name} Name: perl-%{cpan_name}
Version: %(echo '%{cpan_version}' | tr _ .) Version: %(echo '%{cpan_version}' | tr _ .)
Release: 346%{?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
@ -11,16 +11,17 @@ 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.04-USE_MM_LD_RUN_PATH.patch Patch0: %{cpan_name}-7.06-USE_MM_LD_RUN_PATH.patch
# Link to libperl.so explicitly. Bug #960048. # Link to libperl.so explicitly. Bug #960048.
Patch1: %{cpan_name}-7.04-Link-to-libperl-explicitly-on-Linux.patch Patch1: %{cpan_name}-7.06-Link-to-libperl-explicitly-on-Linux.patch
# Unbundle version modules # Unbundle version modules
Patch2: ExtUtils-MakeMaker-7.04-Unbundle-version.patch Patch2: %{cpan_name}-7.04-Unbundle-version.patch
# Unbundle Encode::Locale module # Unbundle Encode::Locale module
Patch3: ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch Patch3: %{cpan_name}-7.00-Unbundle-Encode-Locale.patch
# Cope with missing Encode::Locale, CPAN RT#100268
Patch4: ExtUtils-MakeMaker-7.02-Write-UTF-8-encoded-chunk-if-Locale-Encode-is-not-av.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: make
BuildRequires: perl BuildRequires: perl
# Makefile.Pl uses ExtUtils::MakeMaker from ./lib # Makefile.Pl uses ExtUtils::MakeMaker from ./lib
BuildRequires: perl(Carp) BuildRequires: perl(Carp)
@ -29,6 +30,7 @@ BuildRequires: perl(Cwd)
BuildRequires: perl(Encode) BuildRequires: perl(Encode)
BuildRequires: perl(Exporter) BuildRequires: perl(Exporter)
BuildRequires: perl(File::Basename) BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Copy)
BuildRequires: perl(File::Path) BuildRequires: perl(File::Path)
BuildRequires: perl(File::Spec) >= 0.8 BuildRequires: perl(File::Spec) >= 0.8
BuildRequires: perl(lib) BuildRequires: perl(lib)
@ -38,21 +40,23 @@ BuildRequires: perl(version)
BuildRequires: perl(warnings) BuildRequires: perl(warnings)
# If an XS module is compiled, xsubpp(1) is needed # If an XS module is compiled, xsubpp(1) is needed
BuildRequires: perl-ExtUtils-ParseXS BuildRequires: perl-ExtUtils-ParseXS
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(DirHandle)
BuildRequires: perl(DynaLoader) BuildRequires: perl(DynaLoader)
BuildRequires: perl(ExtUtils::Command) >= 1.16
BuildRequires: perl(ExtUtils::Install) >= 1.52 BuildRequires: perl(ExtUtils::Install) >= 1.52
BuildRequires: perl(ExtUtils::Installed) # 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::XSSymSet is not needed (VMS only)
BuildRequires: perl(File::Find) BuildRequires: perl(File::Find)
BuildRequires: perl(File::Temp) >= 0.22 BuildRequires: perl(File::Temp) >= 0.22
BuildRequires: perl(Getopt::Long) BuildRequires: perl(Getopt::Long)
BuildRequires: perl(IO::File) # IO::File not used at tests
# IO::Handle not used # IO::Handle not used
BuildRequires: perl(less) BuildRequires: perl(less)
BuildRequires: perl(overload) BuildRequires: perl(overload)
@ -64,26 +68,33 @@ BuildRequires: perl(subs)
BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::Harness)
BuildRequires: perl(Test::More) BuildRequires: perl(Test::More)
# threads::shared not used # threads::shared not used
BuildRequires: perl(utf8)
# XSLoader not used # XSLoader not used
# Optional tests # Optional tests
BuildRequires: perl(B)
BuildRequires: perl(CPAN::Meta::Requirements) >= 2.130
BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(ExtUtils::CBuilder)
BuildRequires: perl(PerlIO) BuildRequires: perl(PerlIO)
# Keep YAML optional # Keep YAML optional
# 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))
# CPAN::Meta is optional Requires: perl(B)
# CPAN::Meta 2.143240 is optional
# CPAN::Meta::Converter 2.141170 is optional
# CPAN::Meta::Requirements 2.130 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 correctly # 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.19
Requires: perl(ExtUtils::Install) >= 1.52 Requires: perl(ExtUtils::Install) >= 1.52
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)
# JSON::PP is optional
# 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)
@ -106,13 +117,30 @@ This utility is designed to write a Makefile for an extension module from a
Makefile.PL. It is based on the Makefile.SH model provided by Andy Makefile.PL. It is based on the Makefile.SH model provided by Andy
Dougherty and the perl5-porters. Dougherty and the perl5-porters.
%package -n perl-ExtUtils-Command
Summary: Perl routines to replace common UNIX commands in Makefiles
License: GPL+ or Artistic
Group: Development/Libraries
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(Carp)
Requires: perl(File::Copy)
Requires: perl(File::Find)
Requires: perl(File::Path)
# File::Spec not used
# VMS::Feature not used
%description -n perl-ExtUtils-Command
This Perl module is used to replace common UNIX commands. In all cases the
functions work with @ARGV rather than taking arguments. This makes them
easier to deal with in Makefiles.
%prep %prep
%setup -q -n ExtUtils-MakeMaker-%{cpan_version} %setup -q -n ExtUtils-MakeMaker-%{cpan_version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# Remove bundled modules # Remove bundled modules
rm -rf bundled rm -rf bundled
sed -i -e '/^bundled\// d' MANIFEST sed -i -e '/^bundled\// d' MANIFEST
@ -136,13 +164,24 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
make test make test
%files %files
%doc Changes CONTRIBUTING NOTES README %doc Changes CONTRIBUTING README
%{_bindir}/* %{_bindir}/*
%{perl_vendorlib}/* %{perl_vendorlib}/*
%exclude %{perl_vendorlib}/ExtUtils/Command.pm
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man3/* %{_mandir}/man3/*
%exclude %{_mandir}/man3/ExtUtils::Command.*
%files -n perl-ExtUtils-Command
%dir %{perl_vendorlib}/ExtUtils
%{perl_vendorlib}/ExtUtils/Command.pm
%{_mandir}/man3/ExtUtils::Command.*
%changelog %changelog
* Tue Sep 01 2015 Petr Pisar <ppisar@redhat.com> - 7.06-1
- 7.06 bump
- ExtUtils::Command module is distributed by ExtUtils-MakeMaker
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.04-346 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.04-346
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
c280fa6a0dfe1d21d6b42792c041ddf7 ExtUtils-MakeMaker-7.04.tar.gz d86589e2a88c00c7f0f40dc8d432ecde ExtUtils-MakeMaker-7.06.tar.gz