diff --git a/Perl-Critic-1.121-do-not-use-Readonly-XS-directly.patch b/Perl-Critic-1.121-do-not-use-Readonly-XS-directly.patch deleted file mode 100644 index b4765d7..0000000 --- a/Perl-Critic-1.121-do-not-use-Readonly-XS-directly.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xt/author/82_optional_modules.t -+++ xt/author/82_optional_modules.t -@@ -11,8 +11,6 @@ - use strict; - use warnings; - --use Readonly; # So we don't barf when we hit Readonly::XS below. -- - use lib 'inc'; - use Perl::Critic::BuildUtilities qw< recommended_module_versions >; - -@@ -37,7 +35,10 @@ - plan tests => scalar keys %module_versions; - - foreach my $module (sort keys %module_versions) { -+ SKIP: { -+ skip 'Readonly::XS must only be used from Readonly itself', 1 if $module eq 'Readonly::XS'; - use_ok( $module, $module_versions{$module} ); -+ } - } - - # Local Variables: diff --git a/Perl-Critic-1.121-metadata.patch b/Perl-Critic-1.121-metadata.patch deleted file mode 100644 index 5770cdd..0000000 --- a/Perl-Critic-1.121-metadata.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Build.PL -+++ Build.PL -@@ -10,6 +10,10 @@ - use strict; - use warnings; - -+use Module::Build 0.4200; -+# meta_merge->resources->license now takes an arrayref of URLs in 0.4200 (or -+# thereabouts, but I can't tell for sure from the Changes file). -+ - use lib 'inc'; - - use Perl::Critic::BuildUtilities qw< -@@ -55,7 +59,7 @@ - resources => { - bugtracker => 'https://github.com/Perl-Critic/Perl-Critic/issues', - homepage => 'http://perlcritic.com', -- license => 'http://dev.perl.org/licenses', -+ license => [ 'http://dev.perl.org/licenses' ], - MailingList => 'http://perlcritic.tigris.org/servlets/SummarizeList?listName=users', - repository => 'git://github.com/Perl-Critic/Perl-Critic.git', - }, diff --git a/perl-Perl-Critic.spec b/perl-Perl-Critic.spec index 9595399..030558c 100644 --- a/perl-Perl-Critic.spec +++ b/perl-Perl-Critic.spec @@ -1,13 +1,11 @@ Name: perl-Perl-Critic -Version: 1.121 -Release: 4%{?dist} +Version: 1.122 +Release: 1%{?dist} Summary: Critique Perl source code for best-practices Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Perl-Critic/ Source0: http://search.cpan.org/CPAN/authors/id/T/TH/THALJEF/Perl-Critic-%{version}.tar.gz -Patch2: Perl-Critic-1.121-do-not-use-Readonly-XS-directly.patch -Patch3: Perl-Critic-1.121-metadata.patch BuildArch: noarch # Build process @@ -28,10 +26,12 @@ BuildRequires: perl(Email::Address) >= 1.889 BuildRequires: perl(English) BuildRequires: perl(Exception::Class) >= 1.23 BuildRequires: perl(Exporter) >= 5.58 +BuildRequires: perl(File::HomeDir) BuildRequires: perl(File::Path) BuildRequires: perl(File::Spec) BuildRequires: perl(File::Spec::Unix) BuildRequires: perl(File::Temp) +BuildRequires: perl(File::Which) BuildRequires: perl(Getopt::Long) BuildRequires: perl(IO::String) BuildRequires: perl(List::MoreUtils) >= 0.19 @@ -43,23 +43,18 @@ BuildRequires: perl(Pod::PlainText) BuildRequires: perl(Pod::Select) BuildRequires: perl(Pod::Spell) >= 1 BuildRequires: perl(Pod::Usage) -BuildRequires: perl(PPI) >= 1.215 +BuildRequires: perl(PPI) >= 1.218 BuildRequires: perl(PPIx::Regexp) >= 0.010 BuildRequires: perl(PPIx::Utilities::Node) BuildRequires: perl(PPIx::Utilities::Statement) >= 1.001 -BuildRequires: perl(Readonly) >= 1.03 +BuildRequires: perl(Readonly) >= 2 BuildRequires: perl(Scalar::Util) BuildRequires: perl(String::Format) >= 1.13 +BuildRequires: perl(Term::ANSIColor) >= 2.02 BuildRequires: perl(Test::Builder) >= 0.92 BuildRequires: perl(Text::ParseWords) >= 3 BuildRequires: perl(version) >= 0.77 -# Optional module requirements -BuildRequires: perl(File::HomeDir) -BuildRequires: perl(File::Which) -BuildRequires: perl(Readonly::XS) -BuildRequires: perl(Term::ANSIColor) >= 2.02 - # Main test suite BuildRequires: perl(Fatal) BuildRequires: perl(File::Spec::Functions) @@ -92,8 +87,7 @@ Requires: perl(File::HomeDir) Requires: perl(File::Which) Requires: perl(Module::Pluggable) >= 3.1 Requires: perl(Pod::Parser) -Requires: perl(PPI) >= 1.215 -Requires: perl(Readonly::XS) +Requires: perl(PPI) >= 1.218 Requires: perl(Term::ANSIColor) >= 2.02 %description @@ -121,12 +115,6 @@ of Perl code were mixed directly in the test script. That sucked. %prep %setup -q -n Perl-Critic-%{version} -# xt/author/82_optional_modules.t shouldn't be trying to use Readonly::XS (#1092921) -%patch2 - -# Upstream fix for Build.PL to work with current toolchain -%patch3 - # Drop Test::Kwalitee tests in RHEL ≥ 7 %if 0%{?rhel} >= 7 rm xt/author/95_kwalitee.t @@ -148,7 +136,12 @@ perl Build.PL installdirs=vendor LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test %files -%doc Changes LICENSE README TODO.pod examples/ extras/ tools/ +%if 0%{?_licensedir:1} +%license LICENSE +%else +%doc LICENSE +%endif +%doc Changes README TODO.pod examples/ extras/ tools/ %{_bindir}/perlcritic %{perl_vendorlib}/Perl/ %{_mandir}/man1/perlcritic.1* @@ -159,6 +152,22 @@ LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test %{_mandir}/man3/Test::Perl::Critic::Policy.3pm* %changelog +* Mon Aug 25 2014 Paul Howarth - 1.122-1 +- Update to 1.122 + - Now requires PPI-1.218, which has numerous enahncements and bug fixes + - Also now requires Readonly-2.00, which obviates the need for Readonly::XS + to get fast constants + - File::HomeDir, File::Which, and Term::ANSIColor are all required now + instead of being optional or recommended; this simplifies our test code + and ensures consistent optimal behavior for all users + - Added two new policies: BuiltinFunctions::ProhibitUselessTopic and + RegularExpressions::ProhibitUselessTopic + - Updated the perlcritic.el script to use modern Emacs hooks (GH #556) + - Removed all the internal RCS keyword boilerplate blocks that were never + getting expanded +- Use %%license where possible +- Drop upstreamed patches + * Sat Jun 07 2014 Fedora Release Engineering - 1.121-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 38915f9..762d3a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d14676d579c4fbc2736106f9863d4d1f Perl-Critic-1.121.tar.gz +b4f56e2839bfd868a9d15f0e52874896 Perl-Critic-1.122.tar.gz