commit 002c4be16c8de94453a6dd21147562a1eab6ed55
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Fri Mar 13 15:15:18 2015 +0100
2.10 bump
.gitignore | 1 +
...reate-site-library-directories-on-first-t.patch | 8 ++--
...figuration-direcotory-string-with-a-marke.patch | 53 ++++++++++++----------
perl-CPAN.spec | 13 ++++--
sources | 2 +-
5 files changed, 45 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2e46f2b..94563e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/CPAN-2.05.tar.gz
+/CPAN-2.10.tar.gz
diff --git a/CPAN-2.05-Attemp-to-create-site-library-directories-on-first-t.patch b/CPAN-2.10-Attemp-to-create-site-library-directories-on-first-t.patch
similarity index 92%
rename from CPAN-2.05-Attemp-to-create-site-library-directories-on-first-t.patch
rename to CPAN-2.10-Attemp-to-create-site-library-directories-on-first-t.patch
index b6d36aa..6237cd9 100644
--- a/CPAN-2.05-Attemp-to-create-site-library-directories-on-first-t.patch
+++ b/CPAN-2.10-Attemp-to-create-site-library-directories-on-first-t.patch
@@ -1,4 +1,4 @@
-From e8db9146beb7002f913c5687cf97d0d7d42b7c07 Mon Sep 17 00:00:00 2001
+From 838befec3233b8897788860edad03fd442d5c108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
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ř <ppisar@xxxxxxxxxx>
1 file changed, 18 insertions(+)
diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm
-index d1a8eef..2426812 100644
+index 918e009..7049513 100644
--- a/lib/CPAN/FirstTime.pm
+++ b/lib/CPAN/FirstTime.pm
-@@ -2046,6 +2046,24 @@ sub _print_urllist {
+@@ -2058,6 +2058,24 @@ sub _print_urllist {
}
sub _can_write_to_libdirs {
@@ -50,5 +50,5 @@ index d1a8eef..2426812 100644
&& -w $Config{installarchlib}
&& -w $Config{installsitelib}
--
-1.9.3
+2.1.0
diff --git a/CPAN-2.05-Replace-configuration-direcotory-string-with-a-marke.patch b/CPAN-2.10-Replace-configuration-direcotory-string-with-a-marke.patch
similarity index 81%
rename from CPAN-2.05-Replace-configuration-direcotory-string-with-a-marke.patch
rename to CPAN-2.10-Replace-configuration-direcotory-string-with-a-marke.patch
index 37db543..bd2ba15 100644
--- a/CPAN-2.05-Replace-configuration-direcotory-string-with-a-marke.patch
+++ b/CPAN-2.10-Replace-configuration-direcotory-string-with-a-marke.patch
@@ -1,7 +1,7 @@
-From a5c7a3e5118aac73ac2adef676d842392c41cff3 Mon Sep 17 00:00:00 2001
+From dcf360eee92da4bd6e6ac91e738401050c80cbf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
Date: Wed, 28 Jan 2015 13:21:10 +0100
-Subject: [PATCH] Replace configuration direcotory string with a marker
+Subject: [PATCH] Replace configuration directory string with a marker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -10,12 +10,19 @@ This allows to redefine the configuration directory name at build
time.
Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
+---
+ 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 04d94aa..61c87bf 100644
+index 2f9917b..7ffd773 100644
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -327,21 +327,21 @@ record-session :
+@@ -332,21 +332,21 @@ record-session :
$(PERL) -Ilib -MCPAN -e '$$CPAN::Suppress_readline=$$CPAN::Echo_readline=1;shell' | tee ttt.out
run-with-sqlite :
@@ -43,7 +50,7 @@ index 04d94aa..61c87bf 100644
runadmin :
$(PERL) -Ilib -MCPAN::Admin -eshell
diff --git a/README b/README
-index cadff53..7b1a3ae 100644
+index 5b945ca..0344805 100644
--- a/README
+++ b/README
@@ -269,7 +269,7 @@ DESCRIPTION
@@ -64,7 +71,7 @@ index cadff53..7b1a3ae 100644
directory so that you can save your own preferences instead of the
system-wide ones.
-@@ -494,7 +494,7 @@ CONFIGURATION
+@@ -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
@@ -73,7 +80,7 @@ index cadff53..7b1a3ae 100644
search path of the CPAN module before the use() or require() statements.
The mkmyconfig command writes this file for you.
-@@ -1944,8 +1944,8 @@ FAQ
+@@ -1989,8 +1989,8 @@ FAQ
You may want to configure something like
@@ -85,10 +92,10 @@ index cadff53..7b1a3ae 100644
so that STDOUT is captured in a file for later inspection.
diff --git a/lib/CPAN.pm b/lib/CPAN.pm
-index 4ed4b6c..e30b9d7 100644
+index 93ad482..da7d102 100644
--- a/lib/CPAN.pm
+++ b/lib/CPAN.pm
-@@ -1680,7 +1680,7 @@ restarting the whole get/make/test/install procedure from scratch.
+@@ -1709,7 +1709,7 @@ restarting the whole get/make/test/install procedure from scratch.
=item Lockfile
@@ -97,7 +104,7 @@ index 4ed4b6c..e30b9d7 100644
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
-@@ -1754,7 +1754,7 @@ C<install_tested>.
+@@ -1783,7 +1783,7 @@ C<install_tested>.
=head2 mkmyconfig
@@ -106,7 +113,7 @@ index 4ed4b6c..e30b9d7 100644
directory so that you can save your own preferences instead of the
system-wide ones.
-@@ -1932,7 +1932,7 @@ in a file CPAN/Config.pm.
+@@ -1994,7 +1994,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
@@ -115,7 +122,7 @@ index 4ed4b6c..e30b9d7 100644
added to the search path of the CPAN module before the use() or
require() statements. The mkmyconfig command writes this file for you.
-@@ -3608,8 +3608,8 @@ there is too much output to keep track of.
+@@ -3686,8 +3686,8 @@ there is too much output to keep track of.
You may want to configure something like
@@ -127,10 +134,10 @@ index 4ed4b6c..e30b9d7 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 f114321..a6e596b 100644
+index e596cbc..dcd2255 100644
--- a/lib/CPAN/HandleConfig.pm
+++ b/lib/CPAN/HandleConfig.pm
-@@ -536,7 +536,7 @@ sub cpan_home_dir_candidates {
+@@ -537,7 +537,7 @@ sub cpan_home_dir_candidates {
push @dirs, $ENV{USERPROFILE} if $ENV{USERPROFILE};
$CPAN::Config->{load_module_verbosity} = $old_v;
@@ -140,18 +147,18 @@ index f114321..a6e596b 100644
return wantarray ? @dirs : $dirs[0];
}
diff --git a/scripts/cpan-mirrors b/scripts/cpan-mirrors
-index 3c8678b..7a0e756 100755
+index fe0e29c..493c140 100644
--- a/scripts/cpan-mirrors
+++ b/scripts/cpan-mirrors
-@@ -6,7 +6,7 @@ use warnings;
- use CPAN::Mirrors;
- use Data::Dumper;
+@@ -143,7 +143,7 @@ to your configuration.
--my $mirrored_by_file = '/Users/brian/.cpan/sources/MIRRORED.BY';
-+my $mirrored_by_file = '/Users/brian/.XCPANCONFIGNAMEX/sources/MIRRORED.BY';
- my $mirrors = CPAN::Mirrors->new( $mirrored_by_file );
+ 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).
- my $seen = {};
+ =head1 TO DO
--
-1.9.3
+2.1.0
diff --git a/perl-CPAN.spec b/perl-CPAN.spec
index 5db8f04..5ad831c 100644
--- a/perl-CPAN.spec
+++ b/perl-CPAN.spec
@@ -1,15 +1,15 @@
Name: perl-CPAN
-Version: 2.05
-Release: 309%{?dist}
+Version: 2.10
+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
# Create site paths for the first time, bug #1158873, CPAN RT#99905
-Patch0: CPAN-2.05-Attemp-to-create-site-library-directories-on-first-t.patch
+Patch0: CPAN-2.10-Attemp-to-create-site-library-directories-on-first-t.patch
# Change configuration directory name
-Patch1: CPAN-2.05-Replace-configuration-direcotory-string-with-a-marke.patch
+Patch1: CPAN-2.10-Replace-configuration-direcotory-string-with-a-marke.patch
BuildArch: noarch
BuildRequires: perl
BuildRequires: perl(Config)
@@ -80,6 +80,7 @@ BuildRequires: perl(Text::Wrap)
BuildRequires: perl(warnings)
# Optional:
BuildRequires: perl(CPAN::Meta) >= 2.110350
+# Crypt::OpenPGP not used at tests
# Digest::MD5 not used at tests
BuildRequires: perl(Digest::SHA)
# Keep MIME::Base64 optional
@@ -116,6 +117,7 @@ BuildRequires: perl(YAML) >= 0.60
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl(Archive::Tar) >= 1.50
Requires: perl(CPAN::Meta::Requirements) >= 2.121
+Requires: perl(Data::Dumper)
%if !%{defined perl_bootstrap}
Requires: perl(Devel::Size)
%endif
@@ -200,6 +202,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Fri Mar 13 2015 Petr Pisar <ppisar@xxxxxxxxxx> - 2.10-1
+- 2.10 bump
+
* Wed Jan 28 2015 Petr Pisar <ppisar@xxxxxxxxxx> - 2.05-309
- Allow changing the configuration directory name
diff --git a/sources b/sources
index 1a8e6ec..abb3704 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28e5aa7ea813a5916cae3b7e580d95a4 CPAN-2.05.tar.gz
+1e27d295e4896ed99f908598f4236406 CPAN-2.10.tar.gz
--
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
