Fix Build.PL to work with current toolchain

Add upstream fix for Build.PL to work with current toolchain, and reinstate
use of "Build authortest"
epel9
Paul Howarth 11 years ago
parent dd1a26eb4a
commit d7d9bc9ed5

@ -0,0 +1,22 @@
--- 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',
},

@ -1,18 +1,19 @@
Name: perl-Perl-Critic Name: perl-Perl-Critic
Version: 1.121 Version: 1.121
Release: 2%{?dist} Release: 3%{?dist}
Summary: Critique Perl source code for best-practices Summary: Critique Perl source code for best-practices
Group: Development/Libraries Group: Development/Libraries
License: GPL+ or Artistic License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Perl-Critic/ URL: http://search.cpan.org/dist/Perl-Critic/
Source0: http://search.cpan.org/CPAN/authors/id/T/TH/THALJEF/Perl-Critic-%{version}.tar.gz 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 Patch2: Perl-Critic-1.121-do-not-use-Readonly-XS-directly.patch
Patch3: Perl-Critic-1.121-metadata.patch
BuildArch: noarch BuildArch: noarch
# Build process # Build process
BuildRequires: perl BuildRequires: perl
BuildRequires: perl(lib) BuildRequires: perl(lib)
BuildRequires: perl(Module::Build) BuildRequires: perl(Module::Build) >= 0.42
BuildRequires: perl(Task::Weaken) BuildRequires: perl(Task::Weaken)
# Module requirements # Module requirements
@ -123,6 +124,9 @@ of Perl code were mixed directly in the test script. That sucked.
# xt/author/82_optional_modules.t shouldn't be trying to use Readonly::XS (#1092921) # xt/author/82_optional_modules.t shouldn't be trying to use Readonly::XS (#1092921)
%patch2 %patch2
# Upstream fix for Build.PL to work with current toolchain
%patch3
# Drop Test::Kwalitee tests in RHEL ≥ 7 # Drop Test::Kwalitee tests in RHEL ≥ 7
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
rm xt/author/95_kwalitee.t rm xt/author/95_kwalitee.t
@ -141,10 +145,7 @@ perl Build.PL installdirs=vendor
%{_fixperms} %{buildroot} %{_fixperms} %{buildroot}
%check %check
./Build test LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test
%if 0%{!?perl_bootstrap:1}
LC_ALL=en_US ./Build test --test_files=xt/author/*.t
%endif
%files %files
%doc Changes LICENSE README TODO.pod examples/ extras/ tools/ %doc Changes LICENSE README TODO.pod examples/ extras/ tools/
@ -158,6 +159,10 @@ LC_ALL=en_US ./Build test --test_files=xt/author/*.t
%{_mandir}/man3/Test::Perl::Critic::Policy.3pm* %{_mandir}/man3/Test::Perl::Critic::Policy.3pm*
%changelog %changelog
* Fri May 2 2014 Paul Howarth <paul@city-fan.org> - 1.121-3
- Add upstream fix for Build.PL to work with current toolchain, and reinstate
use of "Build authortest"
* Wed Apr 30 2014 Paul Howarth <paul@city-fan.org> - 1.121-2 * Wed Apr 30 2014 Paul Howarth <paul@city-fan.org> - 1.121-2
- xt/author/82_optional_modules.t shouldn't be trying to use Readonly::XS (#1092921) - xt/author/82_optional_modules.t shouldn't be trying to use Readonly::XS (#1092921)
- Run the author tests using "Build test" rather than "Build authortest" because the - Run the author tests using "Build test" rather than "Build authortest" because the

Loading…
Cancel
Save