[perl-Perl-Critic-Pulp] Restore compatibility with version-0.9907

Petr Pisar ppisar at fedoraproject.org
Thu Apr 3 12:45:42 UTC 2014


commit 050148873a54c482956dc100cca89c70bdeabf81
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Apr 3 14:42:09 2014 +0200

    Restore compatibility with version-0.9907

 ...Critic-Pulp-80-Pass-string-to-version-new.patch |   48 ++++++++++++++++++++
 perl-Perl-Critic-Pulp.spec                         |    8 +++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/Perl-Critic-Pulp-80-Pass-string-to-version-new.patch b/Perl-Critic-Pulp-80-Pass-string-to-version-new.patch
new file mode 100644
index 0000000..876e80f
--- /dev/null
+++ b/Perl-Critic-Pulp-80-Pass-string-to-version-new.patch
@@ -0,0 +1,48 @@
+From 8d22c0d3cae7eb6985e4e401484a2b7717314c37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 3 Apr 2014 14:28:25 +0200
+Subject: [PATCH] Pass string to version->new()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+0.9907 version's new() does not accept PPI objects. Pass literal
+PPI values instead.
+
+<https://rt.cpan.org/Public/Bug/Display.html?id=92100>
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Perl/Critic/Policy/Compatibility/ConstantLeadingUnderscore.pm | 2 +-
+ lib/Perl/Critic/Policy/Compatibility/ConstantPragmaHash.pm        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Perl/Critic/Policy/Compatibility/ConstantLeadingUnderscore.pm b/lib/Perl/Critic/Policy/Compatibility/ConstantLeadingUnderscore.pm
+index 6ac4c79..a9bbbbd 100644
+--- a/lib/Perl/Critic/Policy/Compatibility/ConstantLeadingUnderscore.pm
++++ b/lib/Perl/Critic/Policy/Compatibility/ConstantLeadingUnderscore.pm
+@@ -70,7 +70,7 @@ sub violates {
+     ($inc->module||'') eq 'constant' || next;
+ 
+     if (my $ver = Perl::Critic::Pulp::Utils::include_module_version ($inc)) {
+-      $ver = version->new ($ver);
++      $ver = version->new ($ver->literal);
+       if (! defined $modver || $ver > $modver) {
+         $modver = $ver;
+ 
+diff --git a/lib/Perl/Critic/Policy/Compatibility/ConstantPragmaHash.pm b/lib/Perl/Critic/Policy/Compatibility/ConstantPragmaHash.pm
+index 4e976b5..c942fe4 100644
+--- a/lib/Perl/Critic/Policy/Compatibility/ConstantPragmaHash.pm
++++ b/lib/Perl/Critic/Policy/Compatibility/ConstantPragmaHash.pm
+@@ -66,7 +66,7 @@ sub violates {
+     ($inc->module||'') eq 'constant' || next;
+ 
+     if (my $ver = Perl::Critic::Pulp::Utils::include_module_version ($inc)) {
+-      $ver = version->new ($ver);
++      $ver = version->new ($ver->literal);
+       if (! defined $modver || $ver > $modver) {
+         $modver = $ver;
+ 
+-- 
+1.9.0
+
diff --git a/perl-Perl-Critic-Pulp.spec b/perl-Perl-Critic-Pulp.spec
index 0bd1fe0..bfce96d 100644
--- a/perl-Perl-Critic-Pulp.spec
+++ b/perl-Perl-Critic-Pulp.spec
@@ -1,11 +1,13 @@
 Name:           perl-Perl-Critic-Pulp
 Version:        80
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Some add-on perlcritic policies
 License:        GPLv3+
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Perl-Critic-Pulp/
 Source0:        http://www.cpan.org/authors/id/K/KR/KRYDE/Perl-Critic-Pulp-%{version}.tar.gz
+# Restore compatibility with version-0.9907, CPAN RT#92100, bug #1083991
+Patch0:         Perl-Critic-Pulp-80-Pass-string-to-version-new.patch
 BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -73,6 +75,7 @@ THEMES" in Perl::Critic).
 
 %prep
 %setup -q -n Perl-Critic-Pulp-%{version}
+%patch0 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=perl OPTIMIZE="$RPM_OPT_FLAGS"
@@ -93,6 +96,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 03 2014 Petr Pisar <ppisar at redhat.com> - 80-2
+- Restore compatibility with version-0.9907 (#1083991)
+
 * Tue Aug 06 2013 Petr Pisar <ppisar at redhat.com> - 80-1
 - 80 version bump
 


More information about the scm-commits mailing list