[perl-Padre] Fix compatibility with Pod::Perldoc >= 3.21_01
Petr Pisar
ppisar at fedoraproject.org
Wed May 14 14:12:08 UTC 2014
commit 0da761f42193aa7c064ac4fdb4e9c0f5b51406ec
Author: Petr Písař <ppisar at redhat.com>
Date: Wed May 14 15:52:46 2014 +0200
Fix compatibility with Pod::Perldoc >= 3.21_01
Padre-0.90-No-exit-in-Pod-Perldoc.patch | 33 +++++++++++++++++++++++++++++++
perl-Padre.spec | 14 ++++++++++--
2 files changed, 44 insertions(+), 3 deletions(-)
---
diff --git a/Padre-0.90-No-exit-in-Pod-Perldoc.patch b/Padre-0.90-No-exit-in-Pod-Perldoc.patch
new file mode 100644
index 0000000..75de093
--- /dev/null
+++ b/Padre-0.90-No-exit-in-Pod-Perldoc.patch
@@ -0,0 +1,33 @@
+From 79ab948e1f844cf7e9ea476c21f77449e2978c58 Mon Sep 17 00:00:00 2001
+From: Vladimir Lettiev <thecrux at gmail.com>
+Date: Wed, 14 May 2014 16:00:54 +0200
+Subject: [PATCH] No exit in Pod::Perldoc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix compatibility with Pod::Perldoc >= 3.21_01.
+
+<http://mail.perlide.org/pipermail/padre-dev/2014-April/003593.html>
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Padre/Browser/PseudoPerldoc.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Padre/Browser/PseudoPerldoc.pm b/lib/Padre/Browser/PseudoPerldoc.pm
+index 30a8b5c..e0b4ba0 100644
+--- a/lib/Padre/Browser/PseudoPerldoc.pm
++++ b/lib/Padre/Browser/PseudoPerldoc.pm
+@@ -59,7 +59,7 @@ sub process {
+ $self->find_good_formatter_class;
+ $self->formatter_sanity_check;
+
+- $self->maybe_diddle_INC;
++ $self->maybe_extend_searchpath;
+
+ # for when we're apparently in a module or extension directory
+
+--
+1.9.0
+
diff --git a/perl-Padre.spec b/perl-Padre.spec
index 9853123..1bb2aa5 100644
--- a/perl-Padre.spec
+++ b/perl-Padre.spec
@@ -2,7 +2,7 @@
Name: perl-Padre
Version: 0.90
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Perl Application Development and Refactoring Environment
License: GPL+ or Artistic
Group: Development/Libraries
@@ -11,6 +11,8 @@ Source0: http://search.cpan.org/CPAN/authors/id/P/PL/PLAVEN/Padre-%{versi
Source1: padre.desktop
# Fix compatibility with ORLite-1.98, in Padre-1.96, bug #914310
Patch0: Padre-0.90-Migrating-to-the-delete_where-method-for-bulk-deleti.patch
+# Fix compatibility with Pod::Perldoc >= 3.21_01, bug #1083396
+Patch1: Padre-0.90-No-exit-in-Pod-Perldoc.patch
BuildArch: noarch
BuildRequires: gettext
BuildRequires: desktop-file-utils
@@ -95,7 +97,8 @@ BuildRequires: perl(Parse::ExuberantCTags) >= 1.00
BuildRequires: perl(Pod::Abstract) >= 0.16
BuildRequires: perl(Pod::Functions)
BuildRequires: perl(Pod::POM) >= 0.17
-BuildRequires: perl(Pod::Perldoc) >= 3.15
+# Pod::Perldoc 3.15 and 3.21 for Patch1
+BuildRequires: perl(Pod::Perldoc) >= 3.21
# perl(Pod::Perldoc::ToPod) at lib/Padre/Browser/PseudoPerldoc.pm
BuildRequires: perl(Pod::Perldoc::ToPod)
BuildRequires: perl(Pod::Simple) >= 3.07
@@ -223,7 +226,8 @@ Requires: perl(Params::Util) >= 0.33
Requires: perl(Parse::ErrorString::Perl) >= 0.14
Requires: perl(Parse::ExuberantCTags) >= 1.00
Requires: perl(Pod::Abstract) >= 0.16
-Requires: perl(Pod::Perldoc) >= 3.15
+# Pod::Perldoc 3.15 and 3.21 for Patch1
+Requires: perl(Pod::Perldoc) >= 3.21
Requires: perl(Pod::POM) >= 0.17
Requires: perl(Pod::Simple) >= 3.07
Requires: perl(Pod::Simple::XHTML) >= 3.04
@@ -301,6 +305,7 @@ in a directory called .padre.
%prep
%setup -q -n Padre-%{version}
%patch0 -p1
+%patch1 -p1
find share/{examples,templates} -type f \( -name '*.pl' -o -name '*.t' \) \
-exec chmod 755 {} +
@@ -382,6 +387,9 @@ mkdir "$HOME"
%changelog
+* Wed May 14 2014 Petr Pisar <ppisar at redhat.com> - 0.90-11
+- Fix compatibility with Pod::Perldoc >= 3.21_01 (bug #1083396)
+
* Tue Oct 15 2013 Petr Pisar <ppisar at redhat.com> - 0.90-10
- Fix compatibility with ORLite-1.98 (bug #914310)
More information about the scm-commits
mailing list