>From 7ccb2100f401c4b9d2918ad051dd367119ca8a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx> Date: Wed, 6 May 2015 11:26:16 +0200 Subject: 0.280221 bump in order to dual-live with perl 5.22 diff --git a/ExtUtils-CBuilder-0.280220-Upgrade-to-0.280221.patch b/ExtUtils-CBuilder-0.280220-Upgrade-to-0.280221.patch new file mode 100644 index 0000000..c174bba --- /dev/null +++ b/ExtUtils-CBuilder-0.280220-Upgrade-to-0.280221.patch @@ -0,0 +1,222 @@ +From 8b35f9b918bbab075900b04c8e271f12f4f1a44a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx> +Date: Wed, 6 May 2015 11:17:05 +0200 +Subject: [PATCH] Upgrade to 0.280221 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr PÃsaÅ? <ppisar@xxxxxxxxxx> +--- + Changes | 2 +- + Makefile.PL | 2 +- + lib/ExtUtils/CBuilder.pm | 2 +- + lib/ExtUtils/CBuilder/Base.pm | 2 +- + lib/ExtUtils/CBuilder/Platform/Unix.pm | 2 +- + lib/ExtUtils/CBuilder/Platform/VMS.pm | 7 ++----- + lib/ExtUtils/CBuilder/Platform/Windows.pm | 2 +- + lib/ExtUtils/CBuilder/Platform/aix.pm | 2 +- + lib/ExtUtils/CBuilder/Platform/android.pm | 2 +- + lib/ExtUtils/CBuilder/Platform/cygwin.pm | 2 +- + lib/ExtUtils/CBuilder/Platform/darwin.pm | 2 +- + lib/ExtUtils/CBuilder/Platform/dec_osf.pm | 2 +- + lib/ExtUtils/CBuilder/Platform/os2.pm | 2 +- + t/04-base.t | 16 +++++++++++++++- + 14 files changed, 29 insertions(+), 18 deletions(-) + +diff --git a/Changes b/Changes +index fab9a9d..89301c6 100644 +--- a/Changes ++++ b/Changes +@@ -381,7 +381,7 @@ Revision history for Perl extension ExtUtils::CBuilder. + somehow never got into this copy. [Steve Hay] + + - Added a new 'defines' parameter to compile(), which gives a +- platform-independant way to specify various -Dfoo=bar (or the ++ platform-independent way to specify various -Dfoo=bar (or the + equivalent) compiler defines. [Randy W. Sims] + + 0.14 Mon Sep 19 13:40:37 CDT 2005 +diff --git a/Makefile.PL b/Makefile.PL +index bbef2b7..f96bda9 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -33,7 +33,7 @@ my %WriteMakefileArgs = ( + "TEST_REQUIRES" => { + "Test::More" => "0.47" + }, +- "VERSION" => "0.280220", ++ "VERSION" => "0.280221", + "test" => { + "TESTS" => "t/*.t" + } +diff --git a/lib/ExtUtils/CBuilder.pm b/lib/ExtUtils/CBuilder.pm +index 7ebb399..17a4963 100644 +--- a/lib/ExtUtils/CBuilder.pm ++++ b/lib/ExtUtils/CBuilder.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder; +-$ExtUtils::CBuilder::VERSION = '0.280220'; ++$ExtUtils::CBuilder::VERSION = '0.280221'; + use File::Spec (); + use File::Path (); + use File::Basename (); +diff --git a/lib/ExtUtils/CBuilder/Base.pm b/lib/ExtUtils/CBuilder/Base.pm +index 86ee886..7df61e4 100644 +--- a/lib/ExtUtils/CBuilder/Base.pm ++++ b/lib/ExtUtils/CBuilder/Base.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Base; +-$ExtUtils::CBuilder::Base::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Base::VERSION = '0.280221'; + use strict; + use File::Spec; + use File::Basename; +diff --git a/lib/ExtUtils/CBuilder/Platform/Unix.pm b/lib/ExtUtils/CBuilder/Platform/Unix.pm +index 7c08e5a..a05ae4b 100644 +--- a/lib/ExtUtils/CBuilder/Platform/Unix.pm ++++ b/lib/ExtUtils/CBuilder/Platform/Unix.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::Unix; +-$ExtUtils::CBuilder::Platform::Unix::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::Unix::VERSION = '0.280221'; + use strict; + use ExtUtils::CBuilder::Base; + +diff --git a/lib/ExtUtils/CBuilder/Platform/VMS.pm b/lib/ExtUtils/CBuilder/Platform/VMS.pm +index e12d998..6285e33 100644 +--- a/lib/ExtUtils/CBuilder/Platform/VMS.pm ++++ b/lib/ExtUtils/CBuilder/Platform/VMS.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::VMS; +-$ExtUtils::CBuilder::Platform::VMS::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::VMS::VERSION = '0.280221'; + use strict; + use ExtUtils::CBuilder::Base; + +@@ -165,7 +165,6 @@ sub _liblist_ext { + 'socket' => '', 'X11' => 'DECW$XLIBSHR', + 'Xt' => 'DECW$XTSHR', 'Xm' => 'DECW$XMLIBSHR', + 'Xmu' => 'DECW$XMULIBSHR'); +- if ($self->{'config'}{'vms_cc_type'} ne 'decc') { $libmap{'curses'} = 'VAXCCURSE'; } + + warn "Potential libraries are '$potential_libs'\n" if $verbose; + +@@ -266,9 +265,7 @@ sub _liblist_ext { + } + } + if ($ctype) { +- # This has to precede any other CRTLs, so just make it first +- if ($cand eq 'VAXCCURSE') { unshift @{$found{$ctype}}, $cand; } +- else { push @{$found{$ctype}}, $cand; } ++ push @{$found{$ctype}}, $cand; + warn "\tFound as $cand (really $fullname), type $ctype\n" + if $verbose > 1; + push @flibs, $name unless $libs_seen{$fullname}++; +diff --git a/lib/ExtUtils/CBuilder/Platform/Windows.pm b/lib/ExtUtils/CBuilder/Platform/Windows.pm +index 962ada9..472c801 100644 +--- a/lib/ExtUtils/CBuilder/Platform/Windows.pm ++++ b/lib/ExtUtils/CBuilder/Platform/Windows.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::Windows; +-$ExtUtils::CBuilder::Platform::Windows::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::Windows::VERSION = '0.280221'; + use strict; + use warnings; + +diff --git a/lib/ExtUtils/CBuilder/Platform/aix.pm b/lib/ExtUtils/CBuilder/Platform/aix.pm +index f918699..c40dfaa 100644 +--- a/lib/ExtUtils/CBuilder/Platform/aix.pm ++++ b/lib/ExtUtils/CBuilder/Platform/aix.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::aix; +-$ExtUtils::CBuilder::Platform::aix::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::aix::VERSION = '0.280221'; + use strict; + use ExtUtils::CBuilder::Platform::Unix; + use File::Spec; +diff --git a/lib/ExtUtils/CBuilder/Platform/android.pm b/lib/ExtUtils/CBuilder/Platform/android.pm +index 5b1c8f1..8ceb145 100644 +--- a/lib/ExtUtils/CBuilder/Platform/android.pm ++++ b/lib/ExtUtils/CBuilder/Platform/android.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::android; +-$ExtUtils::CBuilder::Platform::android::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::android::VERSION = '0.280221'; + use strict; + use File::Spec; + use ExtUtils::CBuilder::Platform::Unix; +diff --git a/lib/ExtUtils/CBuilder/Platform/cygwin.pm b/lib/ExtUtils/CBuilder/Platform/cygwin.pm +index d8c3c35..9f1e7fe 100644 +--- a/lib/ExtUtils/CBuilder/Platform/cygwin.pm ++++ b/lib/ExtUtils/CBuilder/Platform/cygwin.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::cygwin; +-$ExtUtils::CBuilder::Platform::cygwin::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::cygwin::VERSION = '0.280221'; + use strict; + use File::Spec; + use ExtUtils::CBuilder::Platform::Unix; +diff --git a/lib/ExtUtils/CBuilder/Platform/darwin.pm b/lib/ExtUtils/CBuilder/Platform/darwin.pm +index 63a77a0..391040b 100644 +--- a/lib/ExtUtils/CBuilder/Platform/darwin.pm ++++ b/lib/ExtUtils/CBuilder/Platform/darwin.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::darwin; +-$ExtUtils::CBuilder::Platform::darwin::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::darwin::VERSION = '0.280221'; + use strict; + use ExtUtils::CBuilder::Platform::Unix; + +diff --git a/lib/ExtUtils/CBuilder/Platform/dec_osf.pm b/lib/ExtUtils/CBuilder/Platform/dec_osf.pm +index afa3c7a..5d4bdf7 100644 +--- a/lib/ExtUtils/CBuilder/Platform/dec_osf.pm ++++ b/lib/ExtUtils/CBuilder/Platform/dec_osf.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::dec_osf; +-$ExtUtils::CBuilder::Platform::dec_osf::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::dec_osf::VERSION = '0.280221'; + use strict; + use ExtUtils::CBuilder::Platform::Unix; + use File::Spec; +diff --git a/lib/ExtUtils/CBuilder/Platform/os2.pm b/lib/ExtUtils/CBuilder/Platform/os2.pm +index e19db90..a5d81ca 100644 +--- a/lib/ExtUtils/CBuilder/Platform/os2.pm ++++ b/lib/ExtUtils/CBuilder/Platform/os2.pm +@@ -1,5 +1,5 @@ + package ExtUtils::CBuilder::Platform::os2; +-$ExtUtils::CBuilder::Platform::os2::VERSION = '0.280220'; ++$ExtUtils::CBuilder::Platform::os2::VERSION = '0.280221'; + use strict; + use ExtUtils::CBuilder::Platform::Unix; + +diff --git a/t/04-base.t b/t/04-base.t +index beffe7f..3b525b7 100644 +--- a/t/04-base.t ++++ b/t/04-base.t +@@ -264,7 +264,21 @@ is_deeply( \%split_seen, \%exp, + touch_file($exporter); + $rv = $base->perl_src(); + ok( -d $rv, "perl_src(): returned a directory" ); +- is( uc($rv), uc(Cwd::realpath($subdir)), "perl_src(): identified directory" ); ++ my $rp = Cwd::realpath($subdir); ++ SKIP: { ++ if ($^O eq 'dec_osf' && $rp =~ m[^/cluster/members/]) { ++ skip "Tru64 cluster filesystem", 1; ++ } # SKIP ++ elsif ($^O eq 'os390') { ++ # os390 also has cluster-like things called 'sysplexed'. So far, the ++ # tail end of the path matches what we passed it (with some prepended ++ # directories). So test for that. ++ like( uc($rp), qr/\U\Q$rp\E$/, "perl_src(): identified directory" ); ++ } ++ else { ++ is( uc($rv), uc($rp), "perl_src(): identified directory" ); ++ } ++ } + is( $capture, q{}, "perl_src(): no warning, as expected" ); + + chdir $cwd +-- +2.1.0 + diff --git a/perl-ExtUtils-CBuilder.spec b/perl-ExtUtils-CBuilder.spec index 79568ab..4b5c17d 100644 --- a/perl-ExtUtils-CBuilder.spec +++ b/perl-ExtUtils-CBuilder.spec @@ -1,16 +1,19 @@ +%global base_version 0.280220 Name: perl-ExtUtils-CBuilder # Compete with perl.spec Epoch: 1 # Mimic perl.spec -Version: 0.280220 +Version: 0.280221 Release: 1%{?dist} Summary: Compile and link C code for Perl modules License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ExtUtils-CBuilder/ -Source0: http://www.cpan.org/authors/id/A/AM/AMBS/ExtUtils-CBuilder-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/A/AM/AMBS/ExtUtils-CBuilder-%{base_version}.tar.gz +# Unbundled from perl 5.21.11 +Patch0: ExtUtils-CBuilder-0.280220-Upgrade-to-0.280221.patch # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048 -Patch0: ExtUtils-CBuilder-0.280219-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch +Patch1: ExtUtils-CBuilder-0.280219-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) @@ -52,8 +55,9 @@ appropriate compilers and linkers in a cross-platform manner. It was motivated by the Module::Build project, but may be useful for other purposes as well. %prep -%setup -q -n ExtUtils-CBuilder-%{version} +%setup -q -n ExtUtils-CBuilder-%{base_version} %patch0 -p1 +%patch1 -p1 %build perl Makefile.PL INSTALLDIRS=vendor @@ -68,11 +72,15 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; make test %files -%doc Changes CONTRIBUTING LICENSE README README.mkdn +%license LICENSE +%doc Changes CONTRIBUTING README README.mkdn %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Wed May 06 2015 Petr Pisar <ppisar@xxxxxxxxxx> - 1:0.280221-1 +- 0.280221 bump in order to dual-live with perl 5.22 + * Mon Nov 03 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 1:0.280220-1 - 0.280220 bump -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/perl-ExtUtils-CBuilder.git/commit/?h=master&id=7ccb2100f401c4b9d2918ad051dd367119ca8a97
-- 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