[perl-Kwiki-ModPerl] Perl 5.18 compatibility

Petr Pisar ppisar at fedoraproject.org
Tue Jul 30 17:11:59 UTC 2013


commit 3eb2654008eb5268de43244f5dd67b141ddad481
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Jul 30 19:11:07 2013 +0200

    Perl 5.18 compatibility

 ...i-ModPerl-0.09-Parenthesise-qw-explicitly.patch |   42 ++++++++++++++++++++
 perl-Kwiki-ModPerl.spec                            |    4 ++
 2 files changed, 46 insertions(+), 0 deletions(-)
---
diff --git a/Kwiki-ModPerl-0.09-Parenthesise-qw-explicitly.patch b/Kwiki-ModPerl-0.09-Parenthesise-qw-explicitly.patch
new file mode 100644
index 0000000..8d716c2
--- /dev/null
+++ b/Kwiki-ModPerl-0.09-Parenthesise-qw-explicitly.patch
@@ -0,0 +1,42 @@
+From d0b04114b33ee997e2f4eb5d0f56126616ad21d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 30 Jul 2013 19:04:39 +0200
+Subject: [PATCH] Parenthesise qw explicitly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Perl 5.18 stopped to put surrounding parentheses around qw operator.
+Current code causes would cause syntax error.
+
+<https://rt.cpan.org/Public/Bug/Display.html?id=87450>
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Kwiki/ModPerl.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Kwiki/ModPerl.pm b/lib/Kwiki/ModPerl.pm
+index f5a2140..6ba42f2 100644
+--- a/lib/Kwiki/ModPerl.pm
++++ b/lib/Kwiki/ModPerl.pm
+@@ -9,14 +9,14 @@ BEGIN {
+         require Apache2::RequestUtil;
+         require Apache2::RequestIO;
+         require Apache2::Const;
+-        Apache2::Const->import qw(:common);
++        Apache2::Const->import( qw/:common/);
+     } else {
+         if ( $mod_perl::VERSION >= 1.99 ) {
+             require Apache::RequestRec;
+             require Apache::RequestUtil;
+             require Apache::RequestIO;
+             require Apache::Const;
+-            Apache::Const->import qw(:common);
++            Apache::Const->import( qw/:common/);
+         } else {
+             require Apache;
+             require Apache::Constants;
+-- 
+1.8.1.4
+
diff --git a/perl-Kwiki-ModPerl.spec b/perl-Kwiki-ModPerl.spec
index ae9776b..a8894ae 100644
--- a/perl-Kwiki-ModPerl.spec
+++ b/perl-Kwiki-ModPerl.spec
@@ -6,6 +6,8 @@ License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Kwiki-ModPerl/
 Source0:        http://www.cpan.org/authors/id/G/GU/GUGOD/Kwiki-ModPerl-%{version}.tar.gz
+# Perl 5.18 compatibility, CPAN RT#87450
+Patch0:         Kwiki-ModPerl-0.09-Parenthesise-qw-explicitly.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -21,6 +23,7 @@ This module allows you to use Kwiki as a mod_perl content handler.
 
 %prep
 %setup -q -n Kwiki-ModPerl-%{version}
+%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -51,6 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Jul 30 2013 Petr Pisar <ppisar at redhat.com> - 0.09-19
 - Perl 5.18 rebuild
+- Perl 5.18 compatibility (CPAN RT#87450)
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.09-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild



More information about the perl-devel mailing list