From 1acab7f0c88e33bd2ec274374a4e268ea2f9d7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Mon, 27 Jun 2016 10:13:21 +0200
Subject: 2.14 bump
---
.gitignore | 1 +
CPAN-2.10-Upgrade-to-2.11.patch | 40 -----
...reate-site-library-directories-on-first-t.patch | 54 -------
...nfiguration-directory-string-with-a-marke.patch | 164 ---------------------
...reate-site-library-directories-on-first-t.patch | 54 +++++++
...nfiguration-directory-string-with-a-marke.patch | 164 +++++++++++++++++++++
perl-CPAN.spec | 27 ++--
sources | 2 +-
8 files changed, 235 insertions(+), 271 deletions(-)
delete mode 100644 CPAN-2.10-Upgrade-to-2.11.patch
delete mode 100644
CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch
delete mode 100644
CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch
create mode 100644
CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch
create mode 100644
CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch
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?= <ppi...@redhat.com>
-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ř <ppi...@redhat.com>
----
- 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.11-Attemp-to-create-site-library-directories-on-first-t.patch
deleted file mode 100644
index 5e14a43..0000000
--- a/CPAN-2.11-Attemp-to-create-site-library-directories-on-first-t.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ba274427f5a508fbac034a4d39480ac4edbc9c19 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Thu, 30 Oct 2014 13:19:16 +0100
-Subject: [PATCH] Attemp to create site library directories on first time
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some vendors configures site library directories into /usr/local, but
-they do not provide the directory on their systems because an
-administrator can have a read-only network-mounted file system there.
-
-When running CPAN for the first time, CPAN cannot find the site
-directories and falls back to local::lib. To restore the user
-expectations with writable /usr/local, this patch tries to create the
-missing directories before checking for their presents.
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- lib/CPAN/FirstTime.pm | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm
-index 918e009..7049513 100644
---- a/lib/CPAN/FirstTime.pm
-+++ b/lib/CPAN/FirstTime.pm
-@@ -2058,6 +2058,24 @@ sub _print_urllist {
- }
-
- sub _can_write_to_libdirs {
-+ for ($Config{installsitelib}, $Config{installsitearch}) {
-+ if (!-d $_) {
-+ $CPAN::Frontend->mywarn(sprintf(
-+ qq{Perl site library directory "%s" does not exist.\n},
-+ $_));
-+ File::Path::make_path($_, { error => \my $failure });
-+ if (@$failure) {
-+ $CPAN::Frontend->mywarn(sprintf(
-+ qq{Perl site library directory "%s" } .
-+ qq{could not been created: %s.\n},
-+ $_, ${$$failure[0]}{$_}));
-+ } else {
-+ $CPAN::Frontend->mywarn(sprintf(
-+ qq{Perl site library directory "%s" created.\n},
-+ $_));
-+ }
-+ }
-+ }
- return -w $Config{installprivlib}
- && -w $Config{installarchlib}
- && -w $Config{installsitelib}
---
-2.1.0
-
diff --git
a/CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch
b/CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch
deleted file mode 100644
index d504a78..0000000
--- a/CPAN-2.11-Replace-configuration-directory-string-with-a-marke.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 22a4e38d49b342d0e65f0a0918ccd14df5d26234 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Wed, 28 Jan 2015 13:21:10 +0100
-Subject: [PATCH] Replace configuration directory string with a marker
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows to redefine the configuration directory name at build
-time.
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- Makefile.PL | 10 +++++-----
- README | 10 +++++-----
- lib/CPAN.pm | 10 +++++-----
- lib/CPAN/HandleConfig.pm | 2 +-
- scripts/cpan-mirrors | 2 +-
- 5 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 2f9917b..7ffd773 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -332,21 +332,21 @@ record-session :
- $(PERL) -Ilib -MCPAN -e
'$$CPAN::Suppress_readline=$$CPAN::Echo_readline=1;shell' | tee ttt.out
-
- run-with-sqlite :
-- $(PERL) -I$$HOME/.cpan -Ilib -MCPAN::SQLite -MCPAN::MyConfig -MCPAN -e
'$$CPAN::Config->{use_sqlite}++;
$$CPAN::Config->{sqlite_dbname}="cpandb-sqlite"; shell'
-+ $(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::SQLite
-MCPAN::MyConfig -MCPAN -e '$$CPAN::Config->{use_sqlite}++;
$$CPAN::Config->{sqlite_dbname}="cpandb-sqlite"; shell'
-
- testrun_very_offline : rm_mirrored_by run_emu_offline
-
- testrun_emu_offline :
-- $(PERL) -I$$HOME/.cpan -Ilib -MCPAN::MyConfig -MCPAN -e
'@CPAN::Defaultsites = qw(file:///dev/null); $$CPAN::Config->{urllist} = [];
shell'
-+ $(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::MyConfig -MCPAN -e
'@CPAN::Defaultsites = qw(file:///dev/null); $$CPAN::Config->{urllist} = [];
shell'
-
- rm_mirrored_by :
-- rm -f $$HOME/.cpan/sources/MIRRORED.BY*
-+ rm -f $$HOME/.XCPANCONFIGNAMEX/sources/MIRRORED.BY*
-
- testrun_http_only :
-- $(PERL) -I$$HOME/.cpan -Ilib -MCPAN::MyConfig -MCPAN -e
'$$CPAN::Config->{urllist} = [qw(http://www.planet-elektronik.de/CPAN/)]; shell'
-+ $(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::MyConfig -MCPAN -e
'$$CPAN::Config->{urllist} = [qw(http://www.planet-elektronik.de/CPAN/)]; shell'
-
- urllist :
-- $(PERL) -Ilib -MCPAN -MCPAN::FirstTime -e
'CPAN::FirstTime::init("$$ENV{HOME}/.cpan/CPAN/MyConfig", args =>
[qw(urllist)])'
-+ $(PERL) -Ilib -MCPAN -MCPAN::FirstTime -e
'CPAN::FirstTime::init("$$ENV{HOME}/.XCPANCONFIGNAMEX/CPAN/MyConfig", args =>
[qw(urllist)])'
-
- runadmin :
- $(PERL) -Ilib -MCPAN::Admin -eshell
-diff --git a/README b/README
-index 5b945ca..0344805 100644
---- a/README
-+++ b/README
-@@ -269,7 +269,7 @@ DESCRIPTION
- restarting the whole get/make/test/install procedure from scratch.
-
- Lockfile
-- Interactive sessions maintain a lockfile, by default "~/.cpan/.lock".
-+ Interactive sessions maintain a lockfile, by default
"~/.XCPANCONFIGNAMEX/.lock".
- Batch jobs can run without a lockfile and not disturb each other.
-
- The shell offers to run in *downgraded mode* when another process is
-@@ -329,7 +329,7 @@ DESCRIPTION
- "install_tested".
-
- mkmyconfig
-- mkmyconfig() writes your own CPAN::MyConfig file into your "~/.cpan/"
-+ mkmyconfig() writes your own CPAN::MyConfig file into your
"~/.XCPANCONFIGNAMEX/"
- directory so that you can save your own preferences instead of the
- system-wide ones.
-
-@@ -526,7 +526,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
-- "$HOME/.cpan/CPAN/MyConfig.pm", because "$HOME/.cpan" is added to the
-+ "$HOME/.XCPANCONFIGNAMEX/CPAN/MyConfig.pm", because
"$HOME/.XCPANCONFIGNAMEX" is added to the
- 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
-
- You may want to configure something like
-
-- o conf make_arg "| tee -ai /root/.cpan/logs/make.out"
-- o conf make_install_arg "| tee -ai
/root/.cpan/logs/make_install.out"
-+ o conf make_arg "| tee -ai /root/.XCPANCONFIGNAMEX/logs/make.out"
-+ o conf make_install_arg "| tee -ai
/root/.XCPANCONFIGNAMEX/logs/make_install.out"
-
- 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
---- a/lib/CPAN.pm
-+++ b/lib/CPAN.pm
-@@ -1708,7 +1708,7 @@ restarting the whole get/make/test/install procedure
from scratch.
-
- =item Lockfile
-
--Interactive sessions maintain a lockfile, by default C<~/.cpan/.lock>.
-+Interactive sessions maintain a lockfile, by default
C<~/.XCPANCONFIGNAMEX/.lock>.
- Batch jobs can run without a lockfile and not disturb each other.
-
- The shell offers to run in I<downgraded mode> when another process is
-@@ -1782,7 +1782,7 @@ C<install_tested>.
-
- =head2 mkmyconfig
-
--mkmyconfig() writes your own CPAN::MyConfig file into your C<~/.cpan/>
-+mkmyconfig() writes your own CPAN::MyConfig file into your
C<~/.XCPANCONFIGNAMEX/>
- 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.
-
- 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 C<$HOME/.cpan/CPAN/MyConfig.pm>, because C<$HOME/.cpan> is
-+best placed in C<$HOME/.XCPANCONFIGNAMEX/CPAN/MyConfig.pm>, because
C<$HOME/.XCPANCONFIGNAMEX> is
- 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.
-
- You may want to configure something like
-
-- o conf make_arg "| tee -ai /root/.cpan/logs/make.out"
-- o conf make_install_arg "| tee -ai /root/.cpan/logs/make_install.out"
-+ o conf make_arg "| tee -ai /root/.XCPANCONFIGNAMEX/logs/make.out"
-+ o conf make_install_arg "| tee -ai
/root/.XCPANCONFIGNAMEX/logs/make_install.out"
-
- 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
---- a/lib/CPAN/HandleConfig.pm
-+++ b/lib/CPAN/HandleConfig.pm
-@@ -537,7 +537,7 @@ sub cpan_home_dir_candidates {
- push @dirs, $ENV{USERPROFILE} if $ENV{USERPROFILE};
-
- $CPAN::Config->{load_module_verbosity} = $old_v;
-- my $dotcpan = $^O eq 'VMS' ? '_cpan' : '.cpan';
-+ my $dotcpan = $^O eq 'VMS' ? '_XCPANCONFIGNAMEX' : '.XCPANCONFIGNAMEX';
- @dirs = map { File::Spec->catdir($_, $dotcpan) } grep { defined } @dirs;
- return wantarray ? @dirs : $dirs[0];
- }
-diff --git a/scripts/cpan-mirrors b/scripts/cpan-mirrors
-index fe0e29c..493c140 100644
---- a/scripts/cpan-mirrors
-+++ b/scripts/cpan-mirrors
-@@ -143,7 +143,7 @@ to your configuration.
-
- If you don't have a F<MIRRORED.BY> file, this program will download one
- for you. It looks through your existing C<urllist> configuration and
--then default locations. It stores it in C<~/.cpan> (or your configured
-+then default locations. It stores it in C<~/.XCPANCONFIGNAMEX> (or your
configured
- location to store files).
-
- =head1 TO DO
---
-2.1.0
-
diff --git
a/CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch
b/CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch
new file mode 100644
index 0000000..6fb7a1e
--- /dev/null
+++ b/CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch
@@ -0,0 +1,54 @@
+From 16089db168d6f62a6ba88d1d160946b8c756acbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Thu, 30 Oct 2014 13:19:16 +0100
+Subject: [PATCH] Attemp to create site library directories on first time
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some vendors configures site library directories into /usr/local, but
+they do not provide the directory on their systems because an
+administrator can have a read-only network-mounted file system there.
+
+When running CPAN for the first time, CPAN cannot find the site
+directories and falls back to local::lib. To restore the user
+expectations with writable /usr/local, this patch tries to create the
+missing directories before checking for their presents.
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ lib/CPAN/FirstTime.pm | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm
+index fb6b7eb..79035b8 100644
+--- a/lib/CPAN/FirstTime.pm
++++ b/lib/CPAN/FirstTime.pm
+@@ -2059,6 +2059,24 @@ sub _print_urllist {
+ }
+
+ sub _can_write_to_libdirs {
++ for ($Config{installsitelib}, $Config{installsitearch}) {
++ if (!-d $_) {
++ $CPAN::Frontend->mywarn(sprintf(
++ qq{Perl site library directory "%s" does not exist.\n},
++ $_));
++ File::Path::make_path($_, { error => \my $failure });
++ if (@$failure) {
++ $CPAN::Frontend->mywarn(sprintf(
++ qq{Perl site library directory "%s" } .
++ qq{could not been created: %s.\n},
++ $_, ${$$failure[0]}{$_}));
++ } else {
++ $CPAN::Frontend->mywarn(sprintf(
++ qq{Perl site library directory "%s" created.\n},
++ $_));
++ }
++ }
++ }
+ return -w $Config{installprivlib}
+ && -w $Config{installarchlib}
+ && -w $Config{installsitelib}
+--
+2.5.5
+
diff --git
a/CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch
b/CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch
new file mode 100644
index 0000000..543dda7
--- /dev/null
+++ b/CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch
@@ -0,0 +1,164 @@
+From f850784742603449bc881030fa5dc2bb0490d771 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Wed, 28 Jan 2015 13:21:10 +0100
+Subject: [PATCH] Replace configuration directory string with a marker
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows to redefine the configuration directory name at build
+time.
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ Makefile.PL | 10 +++++-----
+ README | 10 +++++-----
+ lib/CPAN.pm | 10 +++++-----
+ lib/CPAN/HandleConfig.pm | 2 +-
+ scripts/cpan-mirrors | 2 +-
+ 5 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index a0370cd..564e3ce 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -340,21 +340,21 @@ record-session :
+ $(PERL) -Ilib -MCPAN -e
'$$CPAN::Suppress_readline=$$CPAN::Echo_readline=1;shell' | tee ttt.out
+
+ run-with-sqlite :
+- $(PERL) -I$$HOME/.cpan -Ilib -MCPAN::SQLite -MCPAN::MyConfig -MCPAN -e
'$$CPAN::Config->{use_sqlite}++;
$$CPAN::Config->{sqlite_dbname}="cpandb-sqlite"; shell'
++ $(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::SQLite
-MCPAN::MyConfig -MCPAN -e '$$CPAN::Config->{use_sqlite}++;
$$CPAN::Config->{sqlite_dbname}="cpandb-sqlite"; shell'
+
+ testrun_very_offline : rm_mirrored_by run_emu_offline
+
+ testrun_emu_offline :
+- $(PERL) -I$$HOME/.cpan -Ilib -MCPAN::MyConfig -MCPAN -e
'@CPAN::Defaultsites = qw(file:///dev/null); $$CPAN::Config->{urllist} = [];
shell'
++ $(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::MyConfig -MCPAN -e
'@CPAN::Defaultsites = qw(file:///dev/null); $$CPAN::Config->{urllist} = [];
shell'
+
+ rm_mirrored_by :
+- rm -f $$HOME/.cpan/sources/MIRRORED.BY*
++ rm -f $$HOME/.XCPANCONFIGNAMEX/sources/MIRRORED.BY*
+
+ testrun_http_only :
+- $(PERL) -I$$HOME/.cpan -Ilib -MCPAN::MyConfig -MCPAN -e
'$$CPAN::Config->{urllist} = [qw(http://www.planet-elektronik.de/CPAN/)]; shell'
++ $(PERL) -I$$HOME/.XCPANCONFIGNAMEX -Ilib -MCPAN::MyConfig -MCPAN -e
'$$CPAN::Config->{urllist} = [qw(http://www.planet-elektronik.de/CPAN/)]; shell'
+
+ urllist :
+- $(PERL) -Ilib -MCPAN -MCPAN::FirstTime -e
'CPAN::FirstTime::init("$$ENV{HOME}/.cpan/CPAN/MyConfig", args =>
[qw(urllist)])'
++ $(PERL) -Ilib -MCPAN -MCPAN::FirstTime -e
'CPAN::FirstTime::init("$$ENV{HOME}/.XCPANCONFIGNAMEX/CPAN/MyConfig", args =>
[qw(urllist)])'
+
+ runadmin :
+ $(PERL) -Ilib -MCPAN::Admin -eshell
+diff --git a/README b/README
+index f28834f..2be2869 100644
+--- a/README
++++ b/README
+@@ -269,7 +269,7 @@ DESCRIPTION
+ restarting the whole get/make/test/install procedure from scratch.
+
+ Lockfile
+- Interactive sessions maintain a lockfile, by default "~/.cpan/.lock".
++ Interactive sessions maintain a lockfile, by default
"~/.XCPANCONFIGNAMEX/.lock".
+ Batch jobs can run without a lockfile and not disturb each other.
+
+ The shell offers to run in *downgraded mode* when another process is
+@@ -329,7 +329,7 @@ DESCRIPTION
+ "install_tested".
+
+ mkmyconfig
+- mkmyconfig() writes your own CPAN::MyConfig file into your "~/.cpan/"
++ mkmyconfig() writes your own CPAN::MyConfig file into your
"~/.XCPANCONFIGNAMEX/"
+ directory so that you can save your own preferences instead of the
+ system-wide ones.
+
+@@ -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
+- "$HOME/.cpan/CPAN/MyConfig.pm", because "$HOME/.cpan" is added to the
++ "$HOME/.XCPANCONFIGNAMEX/CPAN/MyConfig.pm", because
"$HOME/.XCPANCONFIGNAMEX" is added to the
+ search path of the CPAN module before the use() or require() statements.
+ The mkmyconfig command writes this file for you.
+
+@@ -1993,8 +1993,8 @@ FAQ
+
+ You may want to configure something like
+
+- o conf make_arg "| tee -ai /root/.cpan/logs/make.out"
+- o conf make_install_arg "| tee -ai
/root/.cpan/logs/make_install.out"
++ o conf make_arg "| tee -ai /root/.XCPANCONFIGNAMEX/logs/make.out"
++ o conf make_install_arg "| tee -ai
/root/.XCPANCONFIGNAMEX/logs/make_install.out"
+
+ so that STDOUT is captured in a file for later inspection.
+
+diff --git a/lib/CPAN.pm b/lib/CPAN.pm
+index ab2d00f..981b5c8 100644
+--- a/lib/CPAN.pm
++++ b/lib/CPAN.pm
+@@ -1722,7 +1722,7 @@ restarting the whole get/make/test/install procedure
from scratch.
+
+ =item Lockfile
+
+-Interactive sessions maintain a lockfile, by default C<~/.cpan/.lock>.
++Interactive sessions maintain a lockfile, by default
C<~/.XCPANCONFIGNAMEX/.lock>.
+ Batch jobs can run without a lockfile and not disturb each other.
+
+ The shell offers to run in I<downgraded mode> when another process is
+@@ -1796,7 +1796,7 @@ C<install_tested>.
+
+ =head2 mkmyconfig
+
+-mkmyconfig() writes your own CPAN::MyConfig file into your C<~/.cpan/>
++mkmyconfig() writes your own CPAN::MyConfig file into your
C<~/.XCPANCONFIGNAMEX/>
+ directory so that you can save your own preferences instead of the
+ system-wide ones.
+
+@@ -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
+-best placed in C<$HOME/.cpan/CPAN/MyConfig.pm>, because C<$HOME/.cpan> is
++best placed in C<$HOME/.XCPANCONFIGNAMEX/CPAN/MyConfig.pm>, because
C<$HOME/.XCPANCONFIGNAMEX> is
+ added to the search path of the CPAN module before the use() or
+ require() statements. The mkmyconfig command writes this file for you.
+
+@@ -3703,8 +3703,8 @@ there is too much output to keep track of.
+
+ You may want to configure something like
+
+- o conf make_arg "| tee -ai /root/.cpan/logs/make.out"
+- o conf make_install_arg "| tee -ai /root/.cpan/logs/make_install.out"
++ o conf make_arg "| tee -ai /root/.XCPANCONFIGNAMEX/logs/make.out"
++ o conf make_install_arg "| tee -ai
/root/.XCPANCONFIGNAMEX/logs/make_install.out"
+
+ so that STDOUT is captured in a file for later inspection.
+
+diff --git a/lib/CPAN/HandleConfig.pm b/lib/CPAN/HandleConfig.pm
+index bd28948..a9612af 100644
+--- a/lib/CPAN/HandleConfig.pm
++++ b/lib/CPAN/HandleConfig.pm
+@@ -537,7 +537,7 @@ sub cpan_home_dir_candidates {
+ push @dirs, $ENV{USERPROFILE} if $ENV{USERPROFILE};
+
+ $CPAN::Config->{load_module_verbosity} = $old_v;
+- my $dotcpan = $^O eq 'VMS' ? '_cpan' : '.cpan';
++ my $dotcpan = $^O eq 'VMS' ? '_XCPANCONFIGNAMEX' : '.XCPANCONFIGNAMEX';
+ @dirs = map { File::Spec->catdir($_, $dotcpan) } grep { defined } @dirs;
+ return wantarray ? @dirs : $dirs[0];
+ }
+diff --git a/scripts/cpan-mirrors b/scripts/cpan-mirrors
+index fe0e29c..493c140 100644
+--- a/scripts/cpan-mirrors
++++ b/scripts/cpan-mirrors
+@@ -143,7 +143,7 @@ to your configuration.
+
+ If you don't have a F<MIRRORED.BY> file, this program will download one
+ for you. It looks through your existing C<urllist> configuration and
+-then default locations. It stores it in C<~/.cpan> (or your configured
++then default locations. It stores it in C<~/.XCPANCONFIGNAMEX> (or your
configured
+ location to store files).
+
+ =head1 TO DO
+--
+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 <ppi...@redhat.com> - 2.14-1
+- 2.14 bump
+
* Wed May 18 2016 Jitka Plesnikova <jples...@redhat.com> - 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
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-CPAN.git/commit/?h=master&id=1acab7f0c88e33bd2ec274374a4e268ea2f9d7c8
_______________________________________________
perl-devel mailing list -- perl-de...@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
