From 4c3b785b4621637e9a7ddc57b2aa1cc67ed08273 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 26 Apr 2019 12:51:48 +0100 Subject: [PATCH] =?UTF-8?q?Add=20workaround=20for=20PPI=20=E2=89=A5=201.25?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Perl-Critic/Perl-Critic/issues/858 --- perl-Perl-Critic-1.132-PPI.patch | 11 +++++++++++ perl-Perl-Critic.spec | 13 +++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 perl-Perl-Critic-1.132-PPI.patch diff --git a/perl-Perl-Critic-1.132-PPI.patch b/perl-Perl-Critic-1.132-PPI.patch new file mode 100644 index 0000000..3a8ca9e --- /dev/null +++ b/perl-Perl-Critic-1.132-PPI.patch @@ -0,0 +1,11 @@ +--- t/05_utils.t ++++ t/05_utils.t +@@ -418,7 +418,7 @@ sub test_parse_arg_list { + [ + q/foo( { bar() }, {}, 'blah' )/ + => [ +- ' { bar() }', ++ [ '{ bar() }' ], + [ qw< {} > ], + [ q<'blah'> ], + ], diff --git a/perl-Perl-Critic.spec b/perl-Perl-Critic.spec index 7f4afff..6c51d56 100644 --- a/perl-Perl-Critic.spec +++ b/perl-Perl-Critic.spec @@ -1,11 +1,12 @@ Name: perl-Perl-Critic Version: 1.132 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Critique Perl source code for best-practices License: GPL+ or Artistic URL: https://metacpan.org/release/Perl-Critic Source0: https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/Perl-Critic-%{version}.tar.gz Patch0: 0001-Change-default-spell-check-tool-from-aspell-to-hunsp.patch +Patch1: perl-Perl-Critic-1.132-PPI.patch BuildArch: noarch # Build process @@ -45,7 +46,7 @@ BuildRequires: perl(Pod::PlainText) BuildRequires: perl(Pod::Select) BuildRequires: perl(Pod::Spell) >= 1 BuildRequires: perl(Pod::Usage) -BuildRequires: perl(PPI) >= 1.224 +BuildRequires: perl(PPI) >= 1.250 BuildRequires: perl(PPIx::QuoteLike) BuildRequires: perl(PPIx::Regexp) >= 0.010 BuildRequires: perl(PPIx::Utilities::Node) @@ -122,6 +123,10 @@ of Perl code were mixed directly in the test script. That sucked. # Switch spell checker tool from aspell to hunspell %patch0 -p1 +# Workaround for PPI ≥ 1.250 +# https://github.com/Perl-Critic/Perl-Critic/issues/858 +%patch1 + # Drop exec bits from samples/docs to avoid dependency bloat find tools examples -type f -exec chmod -c -x {} ';' @@ -153,6 +158,10 @@ LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test %{_mandir}/man3/Test::Perl::Critic::Policy.3* %changelog +* Fri Apr 26 2019 Paul Howarth - 1.132-7 +- Add workaround for PPI ≥ 1.250 + https://github.com/Perl-Critic/Perl-Critic/issues/858 + * Fri Feb 01 2019 Fedora Release Engineering - 1.132-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild