From e246452eaa62ab7d49d45364d8aff51ef675f346 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Feb 28 2012 10:59:53 +0000 Subject: Spec clean-up - Separate build requirements and runtime requirements - Drop redundant %{?perl_default_filter} - Fix permissions verbosely - Use tabs --- diff --git a/perl-Perl-Critic.spec b/perl-Perl-Critic.spec index 73c9554..216f424 100644 --- a/perl-Perl-Critic.spec +++ b/perl-Perl-Critic.spec @@ -1,90 +1,90 @@ -Name: perl-Perl-Critic -Version: 1.117 -Release: 2%{?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 -BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Name: perl-Perl-Critic +Version: 1.117 +Release: 3%{?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 +BuildArch: noarch # Build process -BuildRequires: perl(Module::Build) -BuildRequires: perl(Task::Weaken) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Task::Weaken) # Module requirements -BuildRequires: aspell-en -Requires: aspell -BuildRequires: perl(B::Keywords) >= 1.05 -BuildRequires: perl(Carp) -BuildRequires: perl(charnames) -BuildRequires: perl(Config::Tiny) >= 2 -BuildRequires: perl(Email::Address) >= 1.889 -BuildRequires: perl(English) -BuildRequires: perl(Exception::Class) >= 1.23 -BuildRequires: perl(Exporter) -BuildRequires: perl(File::Basename) -BuildRequires: perl(File::Find) -BuildRequires: perl(File::Path) -BuildRequires: perl(File::Spec) -BuildRequires: perl(File::Spec::Unix) -BuildRequires: perl(File::Temp) -BuildRequires: perl(Getopt::Long) -BuildRequires: perl(IO::String) -BuildRequires: perl(List::MoreUtils) >= 0.19 -BuildRequires: perl(List::Util) -BuildRequires: perl(Module::Pluggable) >= 3.1 -Requires: perl(Module::Pluggable) >= 3.1 -BuildRequires: perl(overload) -BuildRequires: perl(Perl::Tidy) -BuildRequires: perl(Pod::Parser) -Requires: perl(Pod::Parser) -BuildRequires: perl(Pod::PlainText) -BuildRequires: perl(Pod::Select) -BuildRequires: perl(Pod::Spell) >= 1 -BuildRequires: perl(Pod::Usage) -BuildRequires: perl(PPI) >= 1.215 -Requires: perl(PPI) >= 1.215 -BuildRequires: perl(PPIx::Regexp) >= 0.010 -BuildRequires: perl(PPIx::Utilities::Statement) >= 1.001 -BuildRequires: perl(Readonly) >= 1.03 -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(strict) -BuildRequires: perl(String::Format) >= 1.13 -BuildRequires: perl(Text::ParseWords) >= 3 -BuildRequires: perl(version) >= 0.77 -BuildRequires: perl(warnings) +BuildRequires: aspell-en +BuildRequires: perl(B::Keywords) >= 1.05 +BuildRequires: perl(Carp) +BuildRequires: perl(charnames) +BuildRequires: perl(Config::Tiny) >= 2 +BuildRequires: perl(Email::Address) >= 1.889 +BuildRequires: perl(English) +BuildRequires: perl(Exception::Class) >= 1.23 +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Spec::Unix) +BuildRequires: perl(File::Temp) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(IO::String) +BuildRequires: perl(List::MoreUtils) >= 0.19 +BuildRequires: perl(List::Util) +BuildRequires: perl(Module::Pluggable) >= 3.1 +BuildRequires: perl(overload) +BuildRequires: perl(Perl::Tidy) +BuildRequires: perl(Pod::Parser) +BuildRequires: perl(Pod::PlainText) +BuildRequires: perl(Pod::Select) +BuildRequires: perl(Pod::Spell) >= 1 +BuildRequires: perl(Pod::Usage) +BuildRequires: perl(PPI) >= 1.215 +BuildRequires: perl(PPIx::Regexp) >= 0.010 +BuildRequires: perl(PPIx::Utilities::Statement) >= 1.001 +BuildRequires: perl(Readonly) >= 1.03 +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(strict) +BuildRequires: perl(String::Format) >= 1.13 +BuildRequires: perl(Text::ParseWords) >= 3 +BuildRequires: perl(version) >= 0.77 +BuildRequires: perl(warnings) # Optional module requirements -BuildRequires: perl(File::HomeDir) -Requires: perl(File::HomeDir) -BuildRequires: perl(File::Which) -Requires: perl(File::Which) -BuildRequires: perl(Readonly::XS) -Requires: perl(Readonly::XS) -BuildRequires: perl(Term::ANSIColor) >= 2.02 -Requires: perl(Term::ANSIColor) >= 2.02 +BuildRequires: perl(File::HomeDir) +BuildRequires: perl(File::Which) +BuildRequires: perl(Readonly::XS) +BuildRequires: perl(Term::ANSIColor) >= 2.02 # Main test suite -BuildRequires: perl(Test::Deep) -BuildRequires: perl(Test::Memory::Cycle) -BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Deep) +BuildRequires: perl(Test::Memory::Cycle) +BuildRequires: perl(Test::More) -# Author tests: not run if we're bootstrapping +# We don't run the author tests when bootstrapping due to circular dependencies +# Test::Perl::Critic obviously pulls in Perl::Critic too %if 0%{!?perl_bootstrap:1} -BuildRequires: perl(Devel::EnforceEncapsulation) -BuildRequires: perl(Perl::Critic::Policy::Editor::RequireEmacsFileVariables) -BuildRequires: perl(Perl::Critic::Policy::ErrorHandling::RequireUseOfExceptions) -BuildRequires: perl(Test::Kwalitee) -BuildRequires: perl(Test::Perl::Critic) -BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.04 -BuildRequires: perl(Test::Without::Module) +BuildRequires: perl(Devel::EnforceEncapsulation) +BuildRequires: perl(Perl::Critic::Policy::Editor::RequireEmacsFileVariables) +BuildRequires: perl(Perl::Critic::Policy::ErrorHandling::RequireUseOfExceptions) +BuildRequires: perl(Test::Kwalitee) +BuildRequires: perl(Test::Perl::Critic) +BuildRequires: perl(Test::Pod) >= 1.00 +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 +BuildRequires: perl(Test::Without::Module) %endif -# don't "provide" private Perl libs -%{?perl_default_filter} +# Optional/not automatically detected runtime dependencies +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: aspell +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(Term::ANSIColor) >= 2.02 %description Perl::Critic is an extensible framework for creating and applying coding @@ -98,9 +98,9 @@ and customize those Polices through the Perl::Critic interface. You can also create new Policy modules that suit your own tastes. %package -n perl-Test-Perl-Critic-Policy -Summary: A framework for testing your custom Policies -Group: Development/Libraries -License: GPL+ or Artistic +Summary: A framework for testing your custom Policies +Group: Development/Libraries +License: GPL+ or Artistic %description -n perl-Test-Perl-Critic-Policy This module provides a framework for function-testing your custom @@ -110,7 +110,9 @@ of Perl code were mixed directly in the test script. That sucked. %prep %setup -q -n Perl-Critic-%{version} -find . -type f -exec chmod -c -x {} ';' + +# Drop exec bits from samples/docs to avoid dependency bloat +find tools examples -type f -exec chmod -c -x {} ';' %build perl Build.PL installdirs=vendor @@ -135,6 +137,13 @@ LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test %{_mandir}/man3/Test::Perl::Critic::Policy.3pm* %changelog +* Tue Feb 28 2012 Paul Howarth - 1.117-3 +- spec clean-up + - separate build requirements and runtime requirements + - drop redundant %%{?perl_default_filter} + - fix permissions verbosely + - use tabs + * Thu Jan 12 2012 Paul Howarth - 1.117-2 - drop %%defattr, no longer needed @@ -236,9 +245,9 @@ LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test things (CPAN RT#38942) - RegularExpressions::ProhibitUnusedCapture now takes logical alternation into account, so that (e.g.) - if ( /(a)/ || /(b)/ ) { - say $1; - } + if ( /(a)/ || /(b)/ ) { + say $1; + } is not a violation (CPAN RT#38942) - ValuesAndExpressions::ProhibitCommaSeparatedStatements now recognizes 'return { foo => 1, bar => 2 }' as containing a hash constructor, not a