From 61eef2404299a1d19421570d0239731684e257b6 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Nov 29 2019 08:35:25 +0000 Subject: 0.9180 bump --- diff --git a/.gitignore b/.gitignore index b9da9c1..6a5b99a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ CPANPLUS-0.84.tar.gz /CPANPLUS-0.9174.tar.gz /CPANPLUS-0.9176.tar.gz /CPANPLUS-0.9178.tar.gz +/CPANPLUS-0.9180.tar.gz diff --git a/CPANPLUS-0.9178-Do-not-run-t-08_CPANPLUS-Backend.t-parallel.patch b/CPANPLUS-0.9178-Do-not-run-t-08_CPANPLUS-Backend.t-parallel.patch deleted file mode 100644 index 782dd91..0000000 --- a/CPANPLUS-0.9178-Do-not-run-t-08_CPANPLUS-Backend.t-parallel.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2d3a8411908f4f24e19a7e4bb99a845c09accf81 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 26 Jul 2019 14:34:04 +0200 -Subject: [PATCH] Do not run t/08_CPANPLUS-Backend.t parallel -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When running tests in parallel, tests sometimes fail and always in -t/08_CPANPLUS-Backend.t. This patch defines test rules for -TAP::Harness to run t/08_CPANPLUS-Backend.t always isolated. - -https://rt.cpan.org/Ticket/Display.html?id=59085 -Signed-off-by: Petr Písař ---- - MANIFEST | 1 + - t/testrules.yml | 4 ++++ - 2 files changed, 5 insertions(+) - create mode 100644 t/testrules.yml - -diff --git a/MANIFEST b/MANIFEST -index a37d0ee..78a0091 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -161,3 +161,4 @@ t/dummy-perl/lib/.hidden - t/dummy-perl/man/man1/.hidden - t/dummy-perl/man/man3/.hidden - t/inc/conf.pl -+t/testrules.yml -diff --git a/t/testrules.yml b/t/testrules.yml -new file mode 100644 -index 0000000..865f576 ---- /dev/null -+++ b/t/testrules.yml -@@ -0,0 +1,4 @@ -+# CPAN RT#59085 -+seq: -+ - seq: 't/08_CPANPLUS-Backend.t' -+ - par: '**' --- -2.20.1 - diff --git a/CPANPLUS-0.9180-Add-shebang-to-cpanp-run-perl.patch b/CPANPLUS-0.9180-Add-shebang-to-cpanp-run-perl.patch new file mode 100644 index 0000000..25a5a44 --- /dev/null +++ b/CPANPLUS-0.9180-Add-shebang-to-cpanp-run-perl.patch @@ -0,0 +1,25 @@ +From 41e622bde76cf4b5f07b2ba1cc628dcd79fd5440 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 29 Nov 2019 09:23:57 +0100 +Subject: [PATCH] Add shebang to cpanp-run-perl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + bin/cpanp-run-perl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bin/cpanp-run-perl b/bin/cpanp-run-perl +index b6b4dc6..585ed0b 100644 +--- a/bin/cpanp-run-perl ++++ b/bin/cpanp-run-perl +@@ -1,3 +1,4 @@ ++#!perl + use strict; + BEGIN { + my $old = select STDERR; $|++; # turn on autoflush +-- +2.21.0 + diff --git a/perl-CPANPLUS.spec b/perl-CPANPLUS.spec index f1cc576..f9891d8 100644 --- a/perl-CPANPLUS.spec +++ b/perl-CPANPLUS.spec @@ -1,7 +1,7 @@ -%global cpan_version 0.9178 +%global cpan_version 0.9180 Name: perl-CPANPLUS -Version: 0.917.800 -Release: 3%{?dist} +Version: 0.918.0 +Release: 1%{?dist} Summary: Ameliorated interface to the Comprehensive Perl Archive Network # Other files: GPL+ or Artistic ## Unbundled, not used @@ -9,8 +9,8 @@ Summary: Ameliorated interface to the Comprehensive Perl Archive Network License: GPL+ or Artistic URL: https://metacpan.org/release/CPANPLUS Source0: https://cpan.metacpan.org/authors/id/B/BI/BINGOS/CPANPLUS-%{cpan_version}.tar.gz -# Make parallel testing more reliable, CPAN RT#59085 -Patch0: CPANPLUS-0.9178-Do-not-run-t-08_CPANPLUS-Backend.t-parallel.patch +# Add shebang to all scripts, +Patch0: CPANPLUS-0.9180-Add-shebang-to-cpanp-run-perl.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make @@ -33,7 +33,6 @@ BuildRequires: perl(inc::Module::Install) BuildRequires: perl(lib) BuildRequires: perl(Locale::Maketext::Simple) BuildRequires: perl(Module::Loaded) -BuildRequires: sed # Run-time: BuildRequires: perl(Archive::Extract) BuildRequires: perl(base) @@ -101,17 +100,15 @@ interactive shells, command line programs, etc., that use this API. # Removed unused bootstrap modules (required only when updating CPANPLUS with # CPANPLUS when Module::Build is preferred by CPANPLUS) rm -rf bundled -sed -i -e '/^bundled\//d' MANIFEST +perl -i -ne 'print $_ unless m{^bundled/}' MANIFEST # Remove bundled modules %if !%{defined perl_bootstrap} rm -rf inc -sed -i -e '/^inc\//d' MANIFEST +perl -i -ne 'print $_ unless m{^inc/}' MANIFEST %else rm -rf inc/bundle -sed -i -e '/^inc\/bundle\//d' MANIFEST +perl -i -ne 'print $_ unless m{^inc/bundle/}' MANIFEST %endif -# Add shebang -sed -i -e '1i#!perl' bin/cpanp-run-perl %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 @@ -135,6 +132,9 @@ make test %{_mandir}/man3/* %changelog +* Fri Nov 29 2019 Petr Pisar - 0.918.0-1 +- 0.9180 bump + * Fri Jul 26 2019 Petr Pisar - 0.917.800-3 - Make parallel testing more reliable (CPAN RT#59085) diff --git a/sources b/sources index df45688..bafb263 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CPANPLUS-0.9178.tar.gz) = 95729028412b44283771520246f6346f5bf853bf4eb847ed4e825b437643f6ae66df84d99cff3ac92019990db2e9b34a9260615f84640ff17debe3802bd3bdc3 +SHA512 (CPANPLUS-0.9180.tar.gz) = 2c02d5d5cbe9a8cee60f1e3b012ec4c738e9ff5befe0c5bb366b84c2e33f8a6747d03918d7c0433373687413fc913e21507703b78014d50ce74211ff0d21d0c5