From ee5dd08429a92599a8c381b6348c702db7ad8bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 15 Jun 2020 15:02:13 +0200
Subject: [PATCH] 2.28 bump

---
 .gitignore                                    |  1 +
 ...ault-for-LoadBlessed-was-changed-to-.patch | 28 -------------------
 perl-CPAN.spec                                | 16 +++++------
 sources                                       |  2 +-
 4 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 CPAN-2.27-YAML-modules-default-for-LoadBlessed-was-changed-to-.patch

diff --git a/.gitignore b/.gitignore
index 15ce28e..fc6be62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /CPAN-2.25.tar.gz
 /CPAN-2.26.tar.gz
 /CPAN-2.27.tar.gz
+/CPAN-2.28.tar.gz
diff --git a/CPAN-2.27-YAML-modules-default-for-LoadBlessed-was-changed-to-.patch b/CPAN-2.27-YAML-modules-default-for-LoadBlessed-was-changed-to-.patch
deleted file mode 100644
index 16859e1..0000000
--- a/CPAN-2.27-YAML-modules-default-for-LoadBlessed-was-changed-to-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 08bd14786e38ee6f8156227ee560fbbc6150a8bc Mon Sep 17 00:00:00 2001
-From: Tina Mueller <cpan2@tinita.de>
-Date: Thu, 30 Jan 2020 19:34:52 +0100
-Subject: [PATCH] YAML modules default for $LoadBlessed was changed to false
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- lib/CPAN.pm | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/CPAN.pm b/lib/CPAN.pm
-index 2d87f47f..ed8e0444 100644
---- a/lib/CPAN.pm
-+++ b/lib/CPAN.pm
-@@ -559,6 +559,7 @@ sub _yaml_loadfile {
-         # so we do it manually instead
-         my $old_loadcode = ${"$yaml_module\::LoadCode"};
-         ${ "$yaml_module\::LoadCode" } = $CPAN::Config->{yaml_load_code} || 0;
-+        local ${ "$yaml_module\::LoadBlessed" } = 1;
- 
-         my ($code, @yaml);
-         if ($code = UNIVERSAL::can($yaml_module, "LoadFile")) {
--- 
-2.21.1
-
diff --git a/perl-CPAN.spec b/perl-CPAN.spec
index 0ad6c64..6ea2b60 100644
--- a/perl-CPAN.spec
+++ b/perl-CPAN.spec
@@ -9,8 +9,8 @@
 %endif
 
 Name:           perl-CPAN
-Version:        2.27
-Release:        4%{?dist}
+Version:        2.28
+Release:        1%{?dist}
 Summary:        Query, download and build perl modules from CPAN sites
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/CPAN
@@ -19,9 +19,6 @@ Source0:        https://cpan.metacpan.org/authors/id/A/AN/ANDK/CPAN-%{version}.t
 Patch0:         CPAN-2.18-Attemp-to-create-site-library-directories-on-first-t.patch
 # Change configuration directory name
 Patch1:         CPAN-2.18-Replace-configuration-directory-string-with-a-marke.patch
-# Enable loading objects from session YAML files, CPAN RT#131615
-# <https://github.com/andk/cpanpm/pull/133>
-Patch2:         CPAN-2.27-YAML-modules-default-for-LoadBlessed-was-changed-to-.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  findutils
@@ -35,7 +32,6 @@ BuildRequires:  perl(File::Path)
 # Module::Signature not used
 BuildRequires:  perl(strict)
 BuildRequires:  perl(vars)
-BuildRequires:  sed
 # Optional:
 BuildRequires:  perl(File::Spec)
 # YAML::Syck is not used because @ST_PREFS is empty in Makefile.PL
@@ -236,12 +232,11 @@ external download clients to fetch distributions from the net.
 %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' {} \;
+find -type f -exec perl -i -pe 's/XCPANCONFIGNAMEX/cpan/g' {} \;
 # Remove bundled modules
 rm -r ./inc/*
-sed -i -e '/inc\//d' MANIFEST
+perl -i -ne 'print $_ unless m{^inc/}' MANIFEST
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
@@ -265,6 +260,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jun 15 2020 Petr Pisar <ppisar@redhat.com> - 2.28-1
+- 2.28 bump
+
 * Fri Jan 31 2020 Petr Pisar <ppisar@redhat.com> - 2.27-4
 - Enable loading objects from session YAML files (CPAN RT#131615)
 
diff --git a/sources b/sources
index fbd1775..8779bed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (CPAN-2.27.tar.gz) = 97675d0e4c15ec0c5c1be405ba7d72930faaf6bb388361ca111936afe31526716f40def8e621836923983804313237830a9e0829ebcaa83b976a0927023a539c
+SHA512 (CPAN-2.28.tar.gz) = 1b79bf08ab46be12f0c5cc8cd5c893cf5b77b02f76c1d118d6c8af5370ce0beb6bef7071a35b2b53e520a102f09e2c915c7aa52127a80e4f594452e50bbfaa82