diff --git a/.gitignore b/.gitignore index 94563e5..ebf27f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /CPAN-2.05.tar.gz /CPAN-2.10.tar.gz +/CPAN-2.14.tar.gz diff --git a/CPAN-2.10-Upgrade-to-2.11.patch b/CPAN-2.10-Upgrade-to-2.11.patch deleted file mode 100644 index 857a701..0000000 --- a/CPAN-2.10-Upgrade-to-2.11.patch +++ /dev/null @@ -1,40 +0,0 @@ -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.11-Attemp-to-create-site-library-directories-on-first-t.patch b/CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch similarity index 92% rename from CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch rename to CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch index 5e14a43..6fb7a1e 100644 --- a/CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch +++ b/CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch @@ -1,4 +1,4 @@ -From ba274427f5a508fbac034a4d39480ac4edbc9c19 Mon Sep 17 00:00:00 2001 +From 16089db168d6f62a6ba88d1d160946b8c756acbc 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 @@ -21,10 +21,10 @@ Signed-off-by: Petr Písař 1 file changed, 18 insertions(+) diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm -index 918e009..7049513 100644 +index fb6b7eb..79035b8 100644 --- a/lib/CPAN/FirstTime.pm +++ b/lib/CPAN/FirstTime.pm -@@ -2058,6 +2058,24 @@ sub _print_urllist { +@@ -2059,6 +2059,24 @@ sub _print_urllist { } sub _can_write_to_libdirs { @@ -50,5 +50,5 @@ index 918e009..7049513 100644 && -w $Config{installarchlib} && -w $Config{installsitelib} -- -2.1.0 +2.5.5 diff --git a/CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch b/CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch similarity index 92% rename from CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch rename to CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch index d504a78..543dda7 100644 --- a/CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch +++ b/CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch @@ -1,4 +1,4 @@ -From 22a4e38d49b342d0e65f0a0918ccd14df5d26234 Mon Sep 17 00:00:00 2001 +From f850784742603449bc881030fa5dc2bb0490d771 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 @@ -19,10 +19,10 @@ Signed-off-by: Petr Písař 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile.PL b/Makefile.PL -index 2f9917b..7ffd773 100644 +index a0370cd..564e3ce 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -332,21 +332,21 @@ record-session : +@@ -340,21 +340,21 @@ record-session : $(PERL) -Ilib -MCPAN -e '$$CPAN::Suppress_readline=$$CPAN::Echo_readline=1;shell' | tee ttt.out run-with-sqlite : @@ -50,7 +50,7 @@ index 2f9917b..7ffd773 100644 runadmin : $(PERL) -Ilib -MCPAN::Admin -eshell diff --git a/README b/README -index 5b945ca..0344805 100644 +index f28834f..2be2869 100644 --- a/README +++ b/README @@ -269,7 +269,7 @@ DESCRIPTION @@ -71,7 +71,7 @@ index 5b945ca..0344805 100644 directory so that you can save your own preferences instead of the system-wide ones. -@@ -526,7 +526,7 @@ CONFIGURATION +@@ -530,7 +530,7 @@ CONFIGURATION Default values defined in the CPAN/Config.pm file can be overridden in a user specific file: CPAN/MyConfig.pm. Such a file is best placed in @@ -80,7 +80,7 @@ index 5b945ca..0344805 100644 search path of the CPAN module before the use() or require() statements. The mkmyconfig command writes this file for you. -@@ -1989,8 +1989,8 @@ FAQ +@@ -1993,8 +1993,8 @@ FAQ You may want to configure something like @@ -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 6096916..4dc4e0b 100644 +index ab2d00f..981b5c8 100644 --- a/lib/CPAN.pm +++ b/lib/CPAN.pm -@@ -1708,7 +1708,7 @@ restarting the whole get/make/test/install procedure from scratch. +@@ -1722,7 +1722,7 @@ restarting the whole get/make/test/install procedure from scratch. =item Lockfile @@ -104,7 +104,7 @@ index 6096916..4dc4e0b 100644 Batch jobs can run without a lockfile and not disturb each other. The shell offers to run in I when another process is -@@ -1782,7 +1782,7 @@ C. +@@ -1796,7 +1796,7 @@ C. =head2 mkmyconfig @@ -113,7 +113,7 @@ index 6096916..4dc4e0b 100644 directory so that you can save your own preferences instead of the system-wide ones. -@@ -1993,7 +1993,7 @@ in a file CPAN/Config.pm. +@@ -2011,7 +2011,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 6096916..4dc4e0b 100644 added to the search path of the CPAN module before the use() or require() statements. The mkmyconfig command writes this file for you. -@@ -3685,8 +3685,8 @@ there is too much output to keep track of. +@@ -3703,8 +3703,8 @@ there is too much output to keep track of. You may want to configure something like @@ -134,7 +134,7 @@ index 6096916..4dc4e0b 100644 so that STDOUT is captured in a file for later inspection. diff --git a/lib/CPAN/HandleConfig.pm b/lib/CPAN/HandleConfig.pm -index e596cbc..dcd2255 100644 +index bd28948..a9612af 100644 --- a/lib/CPAN/HandleConfig.pm +++ b/lib/CPAN/HandleConfig.pm @@ -537,7 +537,7 @@ sub cpan_home_dir_candidates { @@ -160,5 +160,5 @@ index fe0e29c..493c140 100644 =head1 TO DO -- -2.1.0 +2.5.5 diff --git a/perl-CPAN.spec b/perl-CPAN.spec index 1edbe36..6a4062c 100644 --- a/perl-CPAN.spec +++ b/perl-CPAN.spec @@ -1,19 +1,15 @@ -%global base_version 2.10 - Name: perl-CPAN -Version: 2.11 -Release: 366%{?dist} +Version: 2.14 +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-%{base_version}.tar.gz -# Unbundled from perl 5.21.11 -Patch0: CPAN-2.10-Upgrade-to-2.11.patch +Source0: http://www.cpan.org/authors/id/A/AN/ANDK/CPAN-%{version}.tar.gz # Create site paths for the first time, bug #1158873, CPAN RT#99905 -Patch1: CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch +Patch0: CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch # Change configuration directory name -Patch2: CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch +Patch1: CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: findutils @@ -96,6 +92,7 @@ BuildRequires: perl(Digest::SHA) BuildRequires: perl(Module::Build) # Tests: +# CPAN::Checksums not used BuildRequires: perl(FindBin) BuildRequires: perl(Pod::Usage) BuildRequires: perl(Test::More) @@ -166,7 +163,11 @@ Requires: perl(local::lib) %endif Requires: perl(Module::Build) %if !%{defined perl_bootstrap} +Recommends: perl(Term::ReadKey) Requires: perl(Text::Glob) +# Text::Levenshtein::XS or Text::Levenshtein::Damerau::XS or Text::Levenshtein +# or Text::Levenshtein::Damerau::PP +Suggests: perl(Text::Levenshtein::Damerau::XS) %endif Provides: cpan = %{version} @@ -183,10 +184,9 @@ 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-%{base_version} +%setup -q -n CPAN-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Change configuration name find -type f -exec sed -i -e 's/XCPANCONFIGNAMEX/cpan/g' {} \; # Remove bundled modules @@ -199,7 +199,7 @@ make %{?_smp_mflags} %install 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/* %check @@ -213,6 +213,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Jun 27 2016 Petr Pisar - 2.14-1 +- 2.14 bump + * Wed May 18 2016 Jitka Plesnikova - 2.11-366 - Perl 5.24 re-rebuild of bootstrapped packages diff --git a/sources b/sources index abb3704..d40f123 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e27d295e4896ed99f908598f4236406 CPAN-2.10.tar.gz +7ee0c5f8db95c590818979397237aeda CPAN-2.14.tar.gz