commit d7d9bc9ed5ff10098abf8926b1f9b73c6ca321e0
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Fri May 2 14:49:18 2014 +0100
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"
Perl-Critic-1.121-metadata.patch | 22 ++++++++++++++++++++++
perl-Perl-Critic.spec | 17 +++++++++++------
2 files changed, 33 insertions(+), 6 deletions(-)
---
diff --git a/Perl-Critic-1.121-metadata.patch b/Perl-Critic-1.121-metadata.patch
new file mode 100644
index 0000000..5770cdd
--- /dev/null
+++ b/Perl-Critic-1.121-metadata.patch
@@ -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',
+ },
diff --git a/perl-Perl-Critic.spec b/perl-Perl-Critic.spec
index 2b9de21..df762e1 100644
--- a/perl-Perl-Critic.spec
+++ b/perl-Perl-Critic.spec
@@ -1,18 +1,19 @@
Name: perl-Perl-Critic
Version: 1.121
-Release: 2%{?dist}
+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
Patch2: Perl-Critic-1.121-do-not-use-Readonly-XS-directly.patch
+Patch3: Perl-Critic-1.121-metadata.patch
BuildArch: noarch
# Build process
BuildRequires: perl
BuildRequires: perl(lib)
-BuildRequires: perl(Module::Build)
+BuildRequires: perl(Module::Build) >= 0.42
BuildRequires: perl(Task::Weaken)
# 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)
%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
@@ -141,10 +145,7 @@ perl Build.PL installdirs=vendor
%{_fixperms} %{buildroot}
%check
-./Build test
-%if 0%{!?perl_bootstrap:1}
-LC_ALL=en_US ./Build test --test_files=xt/author/*.t
-%endif
+LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test
%files
%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*
%changelog
+* Fri May 2 2014 Paul Howarth <paul@xxxxxxxxxxxx> - 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@xxxxxxxxxxxx> - 1.121-2
- 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
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
