From 71849163567e19f0f30d419586875511f022ac63 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 15 Jun 2015 09:36:54 +0200
Subject: [PATCH] tests: fix failure for Perl 5.22

Resolves: rhbz#1231279
Version: 9.4.4-1
---
 postgresql-perl-5.22-test-fail.patch | 18 ++++++++++++++++++
 postgresql.spec                      |  5 +++++
 2 files changed, 23 insertions(+)
 create mode 100644 postgresql-perl-5.22-test-fail.patch

diff --git a/postgresql-perl-5.22-test-fail.patch b/postgresql-perl-5.22-test-fail.patch
new file mode 100644
index 0000000..345c16d
--- /dev/null
+++ b/postgresql-perl-5.22-test-fail.patch
@@ -0,0 +1,18 @@
+Upstream report:
+http://www.postgresql.org/message-id/flat/55739876.5010403@gmx.net
+
+diff --git a/src/pl/plperl/expected/plperl_elog.out b/src/pl/plperl/expected/plperl_elog.out
+index c447fa2..0932fde 100644
+--- a/src/pl/plperl/expected/plperl_elog.out
++++ b/src/pl/plperl/expected/plperl_elog.out
+@@ -36,8 +36,8 @@ create or replace function uses_global() returns text language plperl as $$
+   return 'uses_global worked';
+ 
+ $$;
+-ERROR:  Global symbol "$global" requires explicit package name at line 3.
+-Global symbol "$other_global" requires explicit package name at line 4.
++ERROR:  Global symbol "$global" requires explicit package name (did you forget to declare "my $global"?) at line 3.
++Global symbol "$other_global" requires explicit package name (did you forget to declare "my $other_global"?) at line 4.
+ CONTEXT:  compilation of PL/Perl function "uses_global"
+ select uses_global();
+ ERROR:  function uses_global() does not exist
diff --git a/postgresql.spec b/postgresql.spec
index cbd46d6..527c0d5 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -121,6 +121,7 @@ Patch3: postgresql-perl-rpath.patch
 Patch4: postgresql-config-comment.patch
 Patch5: postgresql-var-run-socket.patch
 Patch6: postgresql-man.patch
+Patch7: postgresql-perl-5.22-test-fail.patch
 
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk help2man
 BuildRequires: perl(ExtUtils::Embed), perl-devel
@@ -361,6 +362,7 @@ benchmarks.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # We used to run autoconf here, but there's no longer any real need to,
 # since Postgres ships with a reasonably modern configure script.
@@ -1196,6 +1198,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 15 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.4-1
+- fix for Perl 5.22 rebase (rhbz#1231279)
+
 * Thu Jun 11 2015 Pavel Raiskup <praiskup@redhat.com> - 9.4.4-1
 - update to 9.4.4 per release notes
   http://www.postgresql.org/docs/9.4/static/release-9-4-4.html