Rebase patches to prevent from installing back-up files
This commit is contained in:
Petr Písař
parent
d1b1c73bac
commit
01877150f0
@ -1,4 +1,4 @@
|
||||
From 16089db168d6f62a6ba88d1d160946b8c756acbc Mon Sep 17 00:00:00 2001
|
||||
From 5f0215694664fe0dc78ef59a7c8ca0af83896187 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
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@redhat.com>
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm
|
||||
index fb6b7eb..79035b8 100644
|
||||
index 531c115..8d82795 100644
|
||||
--- a/lib/CPAN/FirstTime.pm
|
||||
+++ b/lib/CPAN/FirstTime.pm
|
||||
@@ -2059,6 +2059,24 @@ sub _print_urllist {
|
||||
@@ -2068,6 +2068,24 @@ sub _print_urllist {
|
||||
}
|
||||
|
||||
sub _can_write_to_libdirs {
|
||||
@ -50,5 +50,5 @@ index fb6b7eb..79035b8 100644
|
||||
&& -w $Config{installarchlib}
|
||||
&& -w $Config{installsitelib}
|
||||
--
|
||||
2.5.5
|
||||
2.13.6
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 8b3473d00f9490f8ee07425ef44b23c6f72a8938 Mon Sep 17 00:00:00 2001
|
||||
From be1fa8db08d1995779592880cfe156f4351a89d5 Mon Sep 17 00:00:00 2001
|
||||
From: brian d foy <brian.d.foy@gmail.com>
|
||||
Date: Tue, 18 Oct 2016 16:02:51 -0400
|
||||
Subject: [PATCH] For cpan -j, make the file an absolute path
|
||||
@ -18,10 +18,10 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/App/Cpan.pm b/lib/App/Cpan.pm
|
||||
index 6561bd4..a9e73cd 100644
|
||||
index 3ddcbe8..bc22cbc 100644
|
||||
--- a/lib/App/Cpan.pm
|
||||
+++ b/lib/App/Cpan.pm
|
||||
@@ -291,7 +291,7 @@ use CPAN 1.80 (); # needs no test
|
||||
@@ -289,7 +289,7 @@ use CPAN 1.80 (); # needs no test
|
||||
use Config;
|
||||
use autouse Cwd => qw(cwd);
|
||||
use autouse 'Data::Dumper' => qw(Dumper);
|
||||
@ -30,7 +30,7 @@ index 6561bd4..a9e73cd 100644
|
||||
use File::Basename;
|
||||
use Getopt::Std;
|
||||
|
||||
@@ -1095,12 +1095,14 @@ sub _shell
|
||||
@@ -1093,12 +1093,14 @@ sub _shell
|
||||
|
||||
sub _load_config # -j
|
||||
{
|
||||
@ -48,5 +48,5 @@ index 6561bd4..a9e73cd 100644
|
||||
my $rc = eval "require '$file'";
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.13.6
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f850784742603449bc881030fa5dc2bb0490d771 Mon Sep 17 00:00:00 2001
|
||||
From c6f460b4bb60352e40e25efe72acd3c2bd14f216 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
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ř <ppisar@redhat.com>
|
||||
5 files changed, 17 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index a0370cd..564e3ce 100644
|
||||
index 2cd2f82..3b826cf 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -340,21 +340,21 @@ record-session :
|
||||
@@ -339,21 +339,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 a0370cd..564e3ce 100644
|
||||
runadmin :
|
||||
$(PERL) -Ilib -MCPAN::Admin -eshell
|
||||
diff --git a/README b/README
|
||||
index f28834f..2be2869 100644
|
||||
index aaf3101..2618d71 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -269,7 +269,7 @@ DESCRIPTION
|
||||
@ -80,7 +80,7 @@ index f28834f..2be2869 100644
|
||||
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
|
||||
@@ -1996,8 +1996,8 @@ FAQ
|
||||
|
||||
You may want to configure something like
|
||||
|
||||
@ -92,10 +92,10 @@ index f28834f..2be2869 100644
|
||||
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
|
||||
index 4f02850..2c117b4 100644
|
||||
--- a/lib/CPAN.pm
|
||||
+++ b/lib/CPAN.pm
|
||||
@@ -1722,7 +1722,7 @@ restarting the whole get/make/test/install procedure from scratch.
|
||||
@@ -1736,7 +1736,7 @@ restarting the whole get/make/test/install procedure from scratch.
|
||||
|
||||
=item Lockfile
|
||||
|
||||
@ -104,7 +104,7 @@ index ab2d00f..981b5c8 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
|
||||
@@ -1796,7 +1796,7 @@ C<install_tested>.
|
||||
@@ -1810,7 +1810,7 @@ C<install_tested>.
|
||||
|
||||
=head2 mkmyconfig
|
||||
|
||||
@ -113,7 +113,7 @@ index ab2d00f..981b5c8 100644
|
||||
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.
|
||||
@@ -2025,7 +2025,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 ab2d00f..981b5c8 100644
|
||||
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.
|
||||
@@ -3720,8 +3720,8 @@ there is too much output to keep track of.
|
||||
|
||||
You may want to configure something like
|
||||
|
||||
@ -134,10 +134,10 @@ index ab2d00f..981b5c8 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 bd28948..a9612af 100644
|
||||
index c72439f..a6b92e8 100644
|
||||
--- a/lib/CPAN/HandleConfig.pm
|
||||
+++ b/lib/CPAN/HandleConfig.pm
|
||||
@@ -537,7 +537,7 @@ sub cpan_home_dir_candidates {
|
||||
@@ -538,7 +538,7 @@ sub cpan_home_dir_candidates {
|
||||
push @dirs, $ENV{USERPROFILE} if $ENV{USERPROFILE};
|
||||
|
||||
$CPAN::Config->{load_module_verbosity} = $old_v;
|
||||
@ -160,5 +160,5 @@ index fe0e29c..493c140 100644
|
||||
|
||||
=head1 TO DO
|
||||
--
|
||||
2.5.5
|
||||
2.13.6
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
Name: perl-CPAN
|
||||
Version: 2.18
|
||||
Release: 395%{?dist}
|
||||
Release: 396%{?dist}
|
||||
Summary: Query, download and build perl modules from CPAN sites
|
||||
License: GPL+ or Artistic
|
||||
URL: http://search.cpan.org/dist/CPAN/
|
||||
@ -17,12 +17,12 @@ Source0: http://www.cpan.org/authors/id/A/AN/ANDK/CPAN-%{cpan_version}.ta
|
||||
# upgrading perl to 5.26
|
||||
Patch0: CPAN-2.16-Rebase-to-2.18-from-perl-5.25.12.patch
|
||||
# Create site paths for the first time, bug #1158873, CPAN RT#99905
|
||||
Patch1: CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch
|
||||
Patch1: CPAN-2.18-Attemp-to-create-site-library-directories-on-first-t.patch
|
||||
# Change configuration directory name
|
||||
Patch2: CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch
|
||||
Patch2: CPAN-2.18-Replace-configuration-directory-string-with-a-marke.patch
|
||||
# Do not search cpan -j file in @INC, CPAN RT#116507, proposed in
|
||||
# <https://github.com/andk/cpanpm/pull/105>
|
||||
Patch3: CPAN-2.14-For-cpan-j-make-the-file-an-absolute-path.patch
|
||||
Patch3: CPAN-2.18-For-cpan-j-make-the-file-an-absolute-path.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: findutils
|
||||
@ -240,6 +240,9 @@ make test
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Tue Dec 19 2017 Petr Pisar <ppisar@redhat.com> - 2.18-396
|
||||
- Rebase patches to prevent from installing back-up files
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-395
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user