From 43b7137ceb0b44b936573f3f78f6d3da74d029f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Thu, 18 Jun 2015 09:21:55 +0200
Subject: Adjust a test for perl-5.22 diagnostic messages
diff --git
a/Padre-0.90-The-text-of-the-error-has-changed-in-perl-5.21.4.-RT.patch
b/Padre-0.90-The-text-of-the-error-has-changed-in-perl-5.21.4.-RT.patch
new file mode 100644
index 0000000..e67a809
--- /dev/null
+++ b/Padre-0.90-The-text-of-the-error-has-changed-in-perl-5.21.4.-RT.patch
@@ -0,0 +1,37 @@
+From b2c6bb157858d52c1dd16769da0b5ac110365304 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Sun, 5 Oct 2014 07:07:37 +0300
+Subject: [PATCH] The text of the error has changed in perl 5.21.4
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream patch ported to 0.90:
+
+From f40571555801c56d16a2b4762dd5bb26506c1f6e Mon Sep 17 00:00:00 2001
+From: Gabor Szabo <ga...@szabgab.com>
+Date: Sun, 5 Oct 2014 07:07:37 +0300
+Subject: [PATCH] The text of the error has changed in perl 5.21.4. RT #99293
+ (Father Chrysostomos)
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ t/82-plugin-manager.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/82-plugin-manager.t b/t/82-plugin-manager.t
+index 47aa675..495acec 100644
+--- a/t/82-plugin-manager.t
++++ b/t/82-plugin-manager.t
+@@ -102,7 +102,7 @@ SCOPE: {
+ is $manager->plugins->{'Padre::Plugin::A'}->{status}, 'error', 'error
in loading A';
+ my $msg1 = $english ? qr/Padre::Plugin::A - Crashed while loading\:/ :
qr/.*/;
+ like $manager->plugins->{'Padre::Plugin::A'}->errstr,
+- qr/^$msg1 Global symbol "\$syntax_error" requires explicit
package name at/,
++ qr/^$msg1 Global symbol "\$syntax_error" requires explicit
package name/,
+ 'text of error message';
+
+ $manager->load_plugin('Padre::Plugin::B');
+--
+2.1.0
+
diff --git a/perl-Padre.spec b/perl-Padre.spec
index 40c5c17..1e6a2b2 100644
--- a/perl-Padre.spec
+++ b/perl-Padre.spec
@@ -16,6 +16,8 @@ Patch1: Padre-0.90-No-exit-in-Pod-Perldoc.patch
# Disable Test::NoWarnings t/01-load.t tests not to confuse with Padre's
# intentional warning on perl 5.20, in Padre-1.02, bug #1141153
Patch2: Padre-0.90-Disable-Test-NoWarnings-t-01-load.t-tests.patch
+# Adjust a test for perl-5.22 diagnostic messages, bug #1231893, CPAN RT#99293
+Patch3:
Padre-0.90-The-text-of-the-error-has-changed-in-perl-5.21.4.-RT.patch
BuildArch: noarch
BuildRequires: coreutils
BuildRequires: desktop-file-utils
@@ -314,6 +316,7 @@ in a directory called .padre.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
find share/{examples,templates} -type f \( -name '*.pl' -o -name '*.t' \) \
-exec chmod 755 {} +
@@ -397,6 +400,7 @@ mkdir "$HOME"
- Perl 5.22 rebuild
- Modernize spec file
- Use xvfb-run for X11 tests
+- Adjust a test for perl-5.22 diagnostic messages (bug #1231893)
* Thu Jun 18 2015 Fedora Release Engineering <rel-...@lists.fedoraproject.org>
- 0.90-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/perl-Padre.git/commit/?h=master&id=43b7137ceb0b44b936573f3f78f6d3da74d029f1
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-de...@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
