diff --git a/CPAN-2.10-Upgrade-to-2.11.patch b/CPAN-2.10-Upgrade-to-2.11.patch new file mode 100644 index 0000000..857a701 --- /dev/null +++ b/CPAN-2.10-Upgrade-to-2.11.patch @@ -0,0 +1,40 @@ +From 4eddce7fa1d61c5f7e02132ae7a5d04101eb6a1c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 6 May 2015 14:22:13 +0200 +Subject: [PATCH] Upgrade to 2.11 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +perl sources are missing a lof CPAN tests. I did not removed them by +this patch. + +Signed-off-by: Petr Písař +--- + lib/CPAN.pm | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/CPAN.pm b/lib/CPAN.pm +index 93ad482..6096916 100644 +--- a/lib/CPAN.pm ++++ b/lib/CPAN.pm +@@ -2,7 +2,7 @@ + # vim: ts=4 sts=4 sw=4: + use strict; + package CPAN; +-$CPAN::VERSION = '2.10'; ++$CPAN::VERSION = '2.11'; + $CPAN::VERSION =~ s/_//; + + # we need to run chdir all over and we would get at wrong libraries +@@ -318,7 +318,6 @@ Enter 'h' for help. + + }, + $CPAN::VERSION, +- $rl_avail + ) + } + my($continuation) = ""; +-- +2.1.0 + diff --git a/CPAN-2.10-Attemp-to-create-site-library-directories-on-first-t.patch b/CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch similarity index 96% rename from CPAN-2.10-Attemp-to-create-site-library-directories-on-first-t.patch rename to CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch index 6237cd9..5e14a43 100644 --- a/CPAN-2.10-Attemp-to-create-site-library-directories-on-first-t.patch +++ b/CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch @@ -1,4 +1,4 @@ -From 838befec3233b8897788860edad03fd442d5c108 Mon Sep 17 00:00:00 2001 +From ba274427f5a508fbac034a4d39480ac4edbc9c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 30 Oct 2014 13:19:16 +0100 Subject: [PATCH] Attemp to create site library directories on first time diff --git a/CPAN-2.10-Replace-configuration-direcotory-string-with-a-marke.patch b/CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch similarity index 95% rename from CPAN-2.10-Replace-configuration-direcotory-string-with-a-marke.patch rename to CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch index bd2ba15..d504a78 100644 --- a/CPAN-2.10-Replace-configuration-direcotory-string-with-a-marke.patch +++ b/CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch @@ -1,4 +1,4 @@ -From dcf360eee92da4bd6e6ac91e738401050c80cbf7 Mon Sep 17 00:00:00 2001 +From 22a4e38d49b342d0e65f0a0918ccd14df5d26234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 28 Jan 2015 13:21:10 +0100 Subject: [PATCH] Replace configuration directory string with a marker @@ -92,10 +92,10 @@ index 5b945ca..0344805 100644 so that STDOUT is captured in a file for later inspection. diff --git a/lib/CPAN.pm b/lib/CPAN.pm -index 93ad482..da7d102 100644 +index 6096916..4dc4e0b 100644 --- a/lib/CPAN.pm +++ b/lib/CPAN.pm -@@ -1709,7 +1709,7 @@ restarting the whole get/make/test/install procedure from scratch. +@@ -1708,7 +1708,7 @@ restarting the whole get/make/test/install procedure from scratch. =item Lockfile @@ -104,7 +104,7 @@ index 93ad482..da7d102 100644 Batch jobs can run without a lockfile and not disturb each other. The shell offers to run in I when another process is -@@ -1783,7 +1783,7 @@ C. +@@ -1782,7 +1782,7 @@ C. =head2 mkmyconfig @@ -113,7 +113,7 @@ index 93ad482..da7d102 100644 directory so that you can save your own preferences instead of the system-wide ones. -@@ -1994,7 +1994,7 @@ in a file CPAN/Config.pm. +@@ -1993,7 +1993,7 @@ in a file CPAN/Config.pm. Default values defined in the CPAN/Config.pm file can be overridden in a user specific file: CPAN/MyConfig.pm. Such a file is @@ -122,7 +122,7 @@ index 93ad482..da7d102 100644 added to the search path of the CPAN module before the use() or require() statements. The mkmyconfig command writes this file for you. -@@ -3686,8 +3686,8 @@ there is too much output to keep track of. +@@ -3685,8 +3685,8 @@ there is too much output to keep track of. You may want to configure something like diff --git a/perl-CPAN.spec b/perl-CPAN.spec index 5ad831c..8d3cd32 100644 --- a/perl-CPAN.spec +++ b/perl-CPAN.spec @@ -1,15 +1,19 @@ +%global base_version 2.10 + Name: perl-CPAN -Version: 2.10 +Version: 2.11 Release: 1%{?dist} Summary: Query, download and build perl modules from CPAN sites License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/CPAN/ -Source0: http://www.cpan.org/authors/id/A/AN/ANDK/CPAN-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/A/AN/ANDK/CPAN-%{base_version}.tar.gz +# Unbundled from perl 5.21.11 +Patch0: CPAN-2.10-Upgrade-to-2.11.patch # Create site paths for the first time, bug #1158873, CPAN RT#99905 -Patch0: CPAN-2.10-Attemp-to-create-site-library-directories-on-first-t.patch +Patch1: CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch # Change configuration directory name -Patch1: CPAN-2.10-Replace-configuration-direcotory-string-with-a-marke.patch +Patch2: CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl(Config) @@ -173,9 +177,10 @@ capabilities and knows how to use LWP, HTTP::Tiny, Net::FTP and certain external download clients to fetch distributions from the net. %prep -%setup -q -n CPAN-%{version} +%setup -q -n CPAN-%{base_version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Change configuration name find -type f -exec sed -i -e 's/XCPANCONFIGNAMEX/cpan/g' {} \; # Remove bundled modules @@ -202,6 +207,9 @@ make test %{_mandir}/man3/* %changelog +* Wed May 06 2015 Petr Pisar - 2.11-1 +- 2.11 bump in order to dual-live with perl 5.22 + * Fri Mar 13 2015 Petr Pisar - 2.10-1 - 2.10 bump