2.26 bump

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -5,8 +5,3 @@
 /CPAN-2.22.tar.gz
 /CPAN-2.25.tar.gz
 /CPAN-2.26.tar.gz
-/CPAN-2.27.tar.gz
-/CPAN-2.28.tar.gz
-/CPAN-2.29.tar.gz
-/CPAN-2.33.tar.gz
-/CPAN-2.34.tar.gz

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

perl-CPAN.spec

@@ -9,8 +9,8 @@
 %endif
 
 Name:           perl-CPAN
-Version:        2.34
-Release:        4%{?dist}
+Version:        2.26
+Release:        1%{?dist}
 Summary:        Query, download and build perl modules from CPAN sites
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/CPAN
@@ -32,6 +32,7 @@ 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
@@ -69,7 +70,6 @@ BuildRequires:  perl(Getopt::Std)
 # HTTP::Request is optional
 BuildRequires:  perl(HTTP::Tiny) >= 0.005
 BuildRequires:  perl(if)
-# IO::Socket::SSL 1.56 is optional
 # YAML::XS or YAML::Syck or JSON::PP, we already use YAML::Syck at a different
 # place, keep JSON::PP optional
 BuildRequires:  perl(lib)
@@ -82,7 +82,6 @@ BuildRequires:  perl(lib)
 # Net::Config not used at tests
 # Net::FTP not used at tests
 # Net::Ping is required but >= 2.13 version is a soft dependency
-# Net::SSLeay 1.49 is optional
 BuildRequires:  perl(Net::Ping)
 BuildRequires:  perl(overload)
 # Pod::Perldoc is optional
@@ -99,9 +98,6 @@ BuildRequires:  perl(Text::Wrap)
 # User::pwent not used at tests
 BuildRequires:  perl(warnings)
 # Optional:
-#%%if !%%{defined perl_bootstrap}
-# CPAN::DistnameInfo not used at tests
-#%%endif
 BuildRequires:  perl(CPAN::Meta) >= 2.110350
 # Crypt::OpenPGP not used at tests
 # Digest::MD5 not used at tests
@@ -115,7 +111,6 @@ BuildRequires:  perl(Module::Build)
 # Tests:
 BuildRequires:  perl(blib)
 # CPAN::Checksums not used
-BuildRequires:  perl(File::Which)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(Pod::Usage)
 BuildRequires:  perl(Test::More)
@@ -140,7 +135,6 @@ BuildRequires:  perl(Module::Signature) >= 0.66
 %endif
 BuildRequires:  perl(Perl::Version)
 %endif
-BuildRequires:  perl(Pod::Perldoc::ToMan)
 %if %{with perl_CPAN_enables_gnupg_test}
 BuildRequires:  perl(Socket)
 %endif
@@ -156,18 +150,7 @@ BuildRequires:  perl(YAML) >= 0.60
 
 Requires:       make
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-# Some subpackages modules are not dual-lived. E.g. "open". If a distribution
-# on CPAN declares a dependency on such a module, CPAN client will fail
-# because the only provider is perl distribution.
-# Another issue is with dual-lived modules whose distribution actually does
-# not declare all needed core dependencies and the installation would also
-# fail.
-# As a result, any CPAN client must run-require the complete perl.
-Requires:       perl
 Requires:       perl(Archive::Tar) >= 1.50
-%if !%{defined perl_bootstrap}
-Recommends:     perl(CPAN::DistnameInfo)
-%endif
 Requires:       perl(CPAN::Meta::Requirements) >= 2.121
 Requires:       perl(Data::Dumper)
 %if !%{defined perl_bootstrap}
@@ -207,10 +190,6 @@ Requires:       perl(Digest::MD5)
 Requires:       perl(Digest::SHA)
 Requires:       perl(Dumpvalue)
 Requires:       perl(ExtUtils::CBuilder)
-# Optional for signature verification CVE-2020-16156
-%if ! %{defined perl_bootstrap}
-Requires:       perl(Module::Signature)
-%endif
 %if ! %{defined perl_bootstrap}
 # Avoid circular deps local::lib -> Module::Install -> CPAN when bootstraping
 # local::lib recommended by CPAN::FirstTime default choice, bug #1122498
@@ -235,10 +214,7 @@ Provides:       cpan = %{version}
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Mac::BuildTools\\)
 # Filter under-specified dependencies
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(CPAN::Meta::Requirements\\)
-# Filter modules bundled for tests
-%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
-%global __requires_exclude %{__requires_exclude}|^perl\\(CPAN::MyConfig\\)
-%global __requires_exclude %{__requires_exclude}|^perl\\(local_utils\\)
+
 
 %description
 The CPAN module automates or at least simplifies the make and install of
@@ -246,30 +222,15 @@ perl modules and extensions. It includes some primitive searching
 capabilities and knows how to use LWP, HTTP::Tiny, Net::FTP and certain
 external download clients to fetch distributions from the net.
 
-%package tests
-Summary:        Tests for %{name}
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       perl-Test-Harness
-
-%description tests
-Tests from %{name}. Execute them
-with "%{_libexecdir}/%{name}/test".
-
 %prep
 %setup -q -n CPAN-%{version}
 %patch0 -p1
 %patch1 -p1
 # Change configuration name
-find -type f -exec perl -i -pe 's/XCPANCONFIGNAMEX/cpan/g' {} \;
+find -type f -exec sed -i -e 's/XCPANCONFIGNAMEX/cpan/g' {} \;
 # Remove bundled modules
 rm -r ./inc/*
-perl -i -ne 'print $_ unless m{^inc/}' MANIFEST
-
-# Help generators to recognize Perl scripts
-for F in t/*.t; do
-    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
-    chmod +x "$F"
-done
+sed -i -e '/inc\//d' MANIFEST
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
@@ -279,38 +240,6 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 %{make_install}
 %{_fixperms} $RPM_BUILD_ROOT/*
 
-# Install tests
-mkdir -p %{buildroot}%{_libexecdir}/%{name}
-cp -a t distroprefs %{buildroot}%{_libexecdir}/%{name}
-# Does not work with system module
-rm %{buildroot}%{_libexecdir}/%{name}/t/51pod.t
-# Remove the tests which need ./lib and ./blib
-rm %{buildroot}%{_libexecdir}/%{name}/t/03pkgs.t
-rm %{buildroot}%{_libexecdir}/%{name}/t/04clean_load.t
-# Needed internet connection
-rm %{buildroot}%{_libexecdir}/%{name}/t/31sessions.t
-# Use system modules for tests
-perl -i -ple 's{-Mblib}{}' %{buildroot}%{_libexecdir}/%{name}/t/97-run.t
-perl -i -ple 's{-Mblib}{}' %{buildroot}%{_libexecdir}/%{name}/t/97-return_values.t
-mkdir -p %{buildroot}%{_libexecdir}/%{name}/blib/script
-ln -s %{_bindir}/cpan %{buildroot}%{_libexecdir}/%{name}/blib/script
-cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
-#!/bin/sh
-set -e
-unset AUTHOR_TEST CPAN_EXPECT_TIMEOUT CPAN_RUN_SHELL_TEST_WITHOUT_EXPECT \
-    ftp_proxy http_proxy no_proxy \
-    PERL5_CPAN_IS_RUNNING PERL5_CPAN_IS_RUNNING_IN_RECURSION PERL_CORE VERBOSE
-# Some tests write into temporary files/directories. The easiest solution
-# is to copy the tests into a writable directory and execute them from there.
-DIR=$(mktemp -d)
-pushd "$DIR"
-cp -a %{_libexecdir}/%{name}/* ./
-prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
-popd
-rm -rf "$DIR"
-EOF
-chmod +x %{buildroot}%{_libexecdir}/%{name}/test
-
 %check
 unset AUTHOR_TEST CPAN_EXPECT_TIMEOUT CPAN_RUN_SHELL_TEST_WITHOUT_EXPECT \
     ftp_proxy http_proxy no_proxy \
@@ -324,88 +253,13 @@ make test
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 
-%files tests
-%{_libexecdir}/%{name}
-
 %changelog
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.34-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jun 03 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.34-3
-- Perl 5.36 re-rebuild of bootstrapped packages
-
-* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.34-2
-- Perl 5.36 rebuild
-
-* Wed Apr 20 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.34-1
-- 2.34 bump
-
-* Mon Apr 04 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.33-1
-- 2.33 bump
-
-* Wed Feb 09 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.29-3
-- Package tests
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.29-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Dec 16 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.29-1
-- 2.29 bump
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.28-479
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 24 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.28-478
-- Perl 5.34 re-rebuild of bootstrapped packages
-
-* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2.28-477
-- Increase release to favour standalone package
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.28-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Sep 23 2020 Petr Pisar <ppisar@redhat.com> - 2.28-5
-- Run-require complete perl
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.28-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jun 26 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.28-3
-- Perl 5.32 re-rebuild of bootstrapped packages
-
-* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2.28-2
-- Perl 5.32 rebuild
-
-* 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)
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.27-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.27-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 04 2019 Petr Pisar <ppisar@redhat.com> - 2.27-1
-- 2.27 bump
-
-* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.26-3
-- Perl 5.30 re-rebuild of bootstrapped packages
-
-* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.26-2
-- Perl 5.30 rebuild
-
 * Tue Mar 19 2019 Petr Pisar <ppisar@redhat.com> - 2.26-1
 - 2.26 bump
 
 * Mon Mar 04 2019 Petr Pisar <ppisar@redhat.com> - 2.25-1
 - 2.25 bump
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.22-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Wed Jan 02 2019 Petr Pisar <ppisar@redhat.com> - 2.22-1
 - 2.22 bump
 

plans/sanity.fmf

@@ -1,5 +0,0 @@
-summary: Sanity tests
-discover:
-    how: fmf
-execute:
-    how: tmt

sources

@@ -1 +1 @@
-SHA512 (CPAN-2.34.tar.gz) = 7238a09ef3c14bc407c1e3a70999d71cb15a0c25950495915bf8cf588ae13d864f1ecad71be8917e96b4399cf626e5782c0abe72a1992b8e3ab48dcc55ae1879
+SHA512 (CPAN-2.26.tar.gz) = 380bc97f9a0ebf7fb11d21764244980066e50f2374e4251401ddbc90219e9b710b601d4a87ab73241240628ab1901d719323e145e4b61771e8484e399dfde166

tests/upstream-tests.fmf

@@ -1,4 +0,0 @@
-summary: Upstream tests
-component: perl-CPAN
-require: perl-CPAN-tests
-test: /usr/libexec/perl-CPAN/test