diff --git a/0001-Change-default-spell-check-tool-from-aspell-to-hunsp.patch b/0001-Change-default-spell-check-tool-from-aspell-to-hunsp.patch index 2e28aba..229e7c5 100644 --- a/0001-Change-default-spell-check-tool-from-aspell-to-hunsp.patch +++ b/0001-Change-default-spell-check-tool-from-aspell-to-hunsp.patch @@ -1,4 +1,4 @@ -From 2396c458927b78ee5616e322ae5ac2c55dd6503e Mon Sep 17 00:00:00 2001 +From ff93fae7cfc2e097c3b37947fd1501bab25481fc Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 21 Jul 2017 11:50:35 +0100 Subject: [PATCH] Change default spell check tool from aspell to hunspell @@ -56,7 +56,7 @@ index c907085f..9a01a667 100644 perl: # blead and dev don't play nicely with Module::Build diff --git a/bin/perlcritic b/bin/perlcritic -index e9455658..08f8f0ec 100644 +index bff0b3ad..6fc3dd05 100644 --- a/bin/perlcritic +++ b/bin/perlcritic @@ -30,7 +30,7 @@ __END__ @@ -69,7 +69,7 @@ index e9455658..08f8f0ec 100644 =head1 NAME diff --git a/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitBooleanGrep.pm b/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitBooleanGrep.pm -index 26ee6107..876e5ed6 100644 +index 1a45f86b..eb7263c7 100644 --- a/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitBooleanGrep.pm +++ b/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitBooleanGrep.pm @@ -86,6 +86,8 @@ __END__ @@ -82,7 +82,7 @@ index 26ee6107..876e5ed6 100644 Perl::Critic::Policy::BuiltinFunctions::ProhibitBooleanGrep - Use C instead of C in boolean context. diff --git a/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitLvalueSubstr.pm b/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitLvalueSubstr.pm -index 53187398..4fa75fe0 100644 +index 1b011623..3c903e91 100644 --- a/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitLvalueSubstr.pm +++ b/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitLvalueSubstr.pm @@ -64,7 +64,7 @@ __END__ @@ -95,7 +95,7 @@ index 53187398..4fa75fe0 100644 =head1 NAME diff --git a/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitShiftRef.pm b/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitShiftRef.pm -index 6fed7ef9..32d01e92 100644 +index e9ce1990..ff612557 100644 --- a/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitShiftRef.pm +++ b/lib/Perl/Critic/Policy/BuiltinFunctions/ProhibitShiftRef.pm @@ -94,7 +94,7 @@ modules. @@ -108,7 +108,7 @@ index 6fed7ef9..32d01e92 100644 sub routine { my $longstring = \shift; diff --git a/lib/Perl/Critic/Policy/Documentation/PodSpelling.pm b/lib/Perl/Critic/Policy/Documentation/PodSpelling.pm -index 5a18fe8f..9305065d 100644 +index 41a59f92..e6464e9a 100644 --- a/lib/Perl/Critic/Policy/Documentation/PodSpelling.pm +++ b/lib/Perl/Critic/Policy/Documentation/PodSpelling.pm @@ -39,7 +39,7 @@ sub supported_parameters { @@ -120,7 +120,7 @@ index 5a18fe8f..9305065d 100644 behavior => 'string', }, { -@@ -200,11 +200,11 @@ sub _run_spell_command { +@@ -202,11 +202,11 @@ sub _run_spell_command { # run spell command and fetch output local $SIG{PIPE} = sub { $got_sigpipe = 1; }; my $command_line = join $SPACE, @{$self->_get_spell_command_line()}; @@ -135,7 +135,7 @@ index 5a18fe8f..9305065d 100644 or throw_generic "Failed to close handle to spelling program: $OS_ERROR"; for (@words) { -@@ -324,11 +324,11 @@ set a global list of spelling exceptions. To do this, put entries in +@@ -326,11 +326,11 @@ set a global list of spelling exceptions. To do this, put entries in a F<.perlcriticrc> file like this: [Documentation::PodSpelling] @@ -149,7 +149,7 @@ index 5a18fe8f..9305065d 100644 shell command. We parse the individual arguments via L so feel free to use quotes around your arguments. If the executable path is an absolute file name, it -@@ -358,13 +358,13 @@ together into a single list of exemptions. +@@ -360,13 +360,13 @@ together into a single list of exemptions. A spell checking program is not included with Perl::Critic. @@ -168,7 +168,7 @@ index 5a18fe8f..9305065d 100644 Pod::Spell->new()->parse_from_file("lib/Your/Module.pm")' >> to see what is actually being checked for spelling. diff --git a/lib/Perl/Critic/Policy/ErrorHandling/RequireCheckingReturnValueOfEval.pm b/lib/Perl/Critic/Policy/ErrorHandling/RequireCheckingReturnValueOfEval.pm -index 591f1d43..9899c0f9 100644 +index f5ed7526..14438cc1 100644 --- a/lib/Perl/Critic/Policy/ErrorHandling/RequireCheckingReturnValueOfEval.pm +++ b/lib/Perl/Critic/Policy/ErrorHandling/RequireCheckingReturnValueOfEval.pm @@ -299,7 +299,7 @@ __END__ @@ -181,7 +181,7 @@ index 591f1d43..9899c0f9 100644 =head1 NAME diff --git a/lib/Perl/Critic/Policy/Modules/RequireBarewordIncludes.pm b/lib/Perl/Critic/Policy/Modules/RequireBarewordIncludes.pm -index bd5132d8..a8197541 100644 +index 9cdcb29d..3da67de7 100644 --- a/lib/Perl/Critic/Policy/Modules/RequireBarewordIncludes.pm +++ b/lib/Perl/Critic/Policy/Modules/RequireBarewordIncludes.pm @@ -46,6 +46,8 @@ __END__ @@ -194,7 +194,7 @@ index bd5132d8..a8197541 100644 Perl::Critic::Policy::Modules::RequireBarewordIncludes - Write C instead of C. diff --git a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitCaptureWithoutTest.pm b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitCaptureWithoutTest.pm -index e47e4e10..ca9efec9 100644 +index 193d8a2e..ddadae5f 100644 --- a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitCaptureWithoutTest.pm +++ b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitCaptureWithoutTest.pm @@ -307,6 +307,8 @@ __END__ @@ -207,7 +207,7 @@ index e47e4e10..ca9efec9 100644 Perl::Critic::Policy::RegularExpressions::ProhibitCaptureWithoutTest - Capture variable used outside conditional. diff --git a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitComplexRegexes.pm b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitComplexRegexes.pm -index 963dc53b..0b5a5459 100644 +index fe3bb7cd..46090ef5 100644 --- a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitComplexRegexes.pm +++ b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitComplexRegexes.pm @@ -99,7 +99,7 @@ __END__ @@ -220,7 +220,7 @@ index 963dc53b..0b5a5459 100644 =head1 NAME diff --git a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitFixedStringMatches.pm b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitFixedStringMatches.pm -index 8821afa3..f2ca75b9 100644 +index ce4d8c07..f8cce2fe 100644 --- a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitFixedStringMatches.pm +++ b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitFixedStringMatches.pm @@ -82,6 +82,8 @@ __END__ @@ -233,7 +233,7 @@ index 8821afa3..f2ca75b9 100644 Perl::Critic::Policy::RegularExpressions::ProhibitFixedStringMatches - Use C or hash instead of fixed-pattern regexps. diff --git a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitSingleCharAlternation.pm b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitSingleCharAlternation.pm -index 88c1e95e..eeecd5c8 100644 +index 5d8de1ba..d4a4d036 100644 --- a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitSingleCharAlternation.pm +++ b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitSingleCharAlternation.pm @@ -83,6 +83,8 @@ __END__ @@ -246,7 +246,7 @@ index 88c1e95e..eeecd5c8 100644 Perl::Critic::Policy::RegularExpressions::ProhibitSingleCharAlternation - Use C<[abc]> instead of C. diff --git a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitUnusedCapture.pm b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitUnusedCapture.pm -index 88760362..98363d54 100644 +index 1f27bdb6..2e16b6a4 100644 --- a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitUnusedCapture.pm +++ b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitUnusedCapture.pm @@ -715,7 +715,7 @@ __END__ @@ -259,7 +259,7 @@ index 88760362..98363d54 100644 =head1 NAME diff --git a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitUnusualDelimiters.pm b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitUnusualDelimiters.pm -index ddf703c3..497b5448 100644 +index 1537726e..19c06b76 100644 --- a/lib/Perl/Critic/Policy/RegularExpressions/ProhibitUnusualDelimiters.pm +++ b/lib/Perl/Critic/Policy/RegularExpressions/ProhibitUnusualDelimiters.pm @@ -77,6 +77,8 @@ __END__ @@ -272,7 +272,7 @@ index ddf703c3..497b5448 100644 Perl::Critic::Policy::RegularExpressions::ProhibitUnusualDelimiters - Use only C or C<{}> to delimit regexps. diff --git a/lib/Perl/Critic/Policy/RegularExpressions/RequireBracesForMultiline.pm b/lib/Perl/Critic/Policy/RegularExpressions/RequireBracesForMultiline.pm -index ed4ffbef..b6363ef0 100644 +index cf14cdf7..f87f46d6 100644 --- a/lib/Perl/Critic/Policy/RegularExpressions/RequireBracesForMultiline.pm +++ b/lib/Perl/Critic/Policy/RegularExpressions/RequireBracesForMultiline.pm @@ -77,6 +77,8 @@ __END__ @@ -285,7 +285,7 @@ index ed4ffbef..b6363ef0 100644 Perl::Critic::Policy::RegularExpressions::RequireBracesForMultiline - Use C<{> and C<}> to delimit multi-line regexps. diff --git a/lib/Perl/Critic/Policy/Variables/ProhibitPunctuationVars.pm b/lib/Perl/Critic/Policy/Variables/ProhibitPunctuationVars.pm -index 37d80063..ae5da1ec 100644 +index 5f9e25ca..9ab0c802 100644 --- a/lib/Perl/Critic/Policy/Variables/ProhibitPunctuationVars.pm +++ b/lib/Perl/Critic/Policy/Variables/ProhibitPunctuationVars.pm @@ -326,6 +326,8 @@ __END__ @@ -298,7 +298,7 @@ index 37d80063..ae5da1ec 100644 Perl::Critic::Policy::Variables::ProhibitPunctuationVars - Write C<$EVAL_ERROR> instead of C<$@>. diff --git a/lib/Perl/Critic/Policy/Variables/RequireLexicalLoopIterators.pm b/lib/Perl/Critic/Policy/Variables/RequireLexicalLoopIterators.pm -index 296bbdba..27afcc7c 100644 +index 6632c996..d04664ba 100644 --- a/lib/Perl/Critic/Policy/Variables/RequireLexicalLoopIterators.pm +++ b/lib/Perl/Critic/Policy/Variables/RequireLexicalLoopIterators.pm @@ -66,7 +66,7 @@ __END__ @@ -311,7 +311,7 @@ index 296bbdba..27afcc7c 100644 =head1 NAME diff --git a/lib/Perl/Critic/Utils.pm b/lib/Perl/Critic/Utils.pm -index fccc823b..5806aa5b 100644 +index 38b91ea6..0813d310 100644 --- a/lib/Perl/Critic/Utils.pm +++ b/lib/Perl/Critic/Utils.pm @@ -1397,6 +1397,8 @@ __END__ @@ -324,7 +324,7 @@ index fccc823b..5806aa5b 100644 Perl::Critic::Utils - General utility subroutines and constants for Perl::Critic and derivative distributions. diff --git a/lib/Perl/Critic/Utils/PPI.pm b/lib/Perl/Critic/Utils/PPI.pm -index 38d49675..9245e3d5 100644 +index 0c58081d..376087d7 100644 --- a/lib/Perl/Critic/Utils/PPI.pm +++ b/lib/Perl/Critic/Utils/PPI.pm @@ -235,7 +235,7 @@ __END__ @@ -337,7 +337,7 @@ index 38d49675..9245e3d5 100644 =head1 NAME diff --git a/t/20_policy_pod_spelling.t b/t/20_policy_pod_spelling.t -index 274b73d1..e9c5de4f 100644 +index 4e782bd7..71d6c620 100644 --- a/t/20_policy_pod_spelling.t +++ b/t/20_policy_pod_spelling.t @@ -58,10 +58,10 @@ $code = <<'END_PERL'; diff --git a/Perl-Critic-1.136-ppidump-shellbang.patch b/Perl-Critic-1.136-ppidump-shellbang.patch new file mode 100644 index 0000000..1975bde --- /dev/null +++ b/Perl-Critic-1.136-ppidump-shellbang.patch @@ -0,0 +1,8 @@ +--- tools/ppidump ++++ tools/ppidump +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + + use strict; + use warnings; diff --git a/perl-Perl-Critic.spec b/perl-Perl-Critic.spec index c7ef5ea..e31add4 100644 --- a/perl-Perl-Critic.spec +++ b/perl-Perl-Critic.spec @@ -6,13 +6,14 @@ %endif Name: perl-Perl-Critic -Version: 1.134 -Release: 5%{?dist} +Version: 1.136 +Release: 1%{?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/modules/by-module/Perl/Perl-Critic-%{version}.tar.gz Patch0: 0001-Change-default-spell-check-tool-from-aspell-to-hunsp.patch +Patch3: Perl-Critic-1.136-ppidump-shellbang.patch BuildArch: noarch # Build process @@ -59,7 +60,7 @@ BuildRequires: perl(PPIx::Utilities::Statement) >= 1.001 BuildRequires: perl(Readonly) >= 2 BuildRequires: perl(Scalar::Util) BuildRequires: perl(strict) -BuildRequires: perl(String::Format) >= 1.13 +BuildRequires: perl(String::Format) >= 1.18 BuildRequires: perl(Term::ANSIColor) >= 2.02 BuildRequires: perl(Test::Builder) >= 0.92 BuildRequires: perl(Text::ParseWords) >= 3 @@ -127,6 +128,9 @@ of Perl code were mixed directly in the test script. That sucked. # Switch spell checker tool from aspell to hunspell %patch0 -p1 +# Fix shellbang in ppidump tool +%patch3 + # Drop exec bits from samples/docs to avoid dependency bloat find tools examples -type f -exec chmod -c -x {} ';' @@ -162,6 +166,15 @@ LC_ALL=en_US ./Build test %{_mandir}/man3/Test::Perl::Critic::Policy.3* %changelog +* Thu Nov 28 2019 Paul Howarth - 1.136-1 +- Update to 1.136 + New Features + - The ProhibitNoWarnings policy now handles warnings in the experimental:: + group (GH#892) + Documentation + - Prevented some example code from showing up in 'perldoc' (GH#799) +- Fix shellbang in ppidump tool + * Thu Sep 5 2019 Paul Howarth - 1.134-5 - Do not run extra tests on RHEL diff --git a/sources b/sources index e087ea5..742de80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Perl-Critic-1.134.tar.gz) = 73d3fd891e055aec5dd38680696ae30f6662d0906baeea878f393adb96e34079e561cd4c3dad00f0c84c7d3a72f3119b2f8ef0c0a1601aaccc8456f1c0039b7a +SHA512 (Perl-Critic-1.136.tar.gz) = 91664725ad6698203b73bcd678a540b57654d7411e3bfa467221216eaebaddd38d518dc1652137b012655d030f83cb48478b4eef3789422578773ce784ba3934