From c27dd8df9e16709906a82364bf0935cf309055fe Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Jul 24 2017 15:03:18 +0000
Subject: plperl: drop postgresql-perl-rpath.patch


Perl now provides valid libperl.so in %_libdir so there's not need
to play with rpath anymore.

Resolves: rhbz#1474417
Version: 9.6.3-7

---

diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
deleted file mode 100644
index 59c199b..0000000
--- a/postgresql-perl-rpath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-We configure Postgres with --disable-rpath because for the most part we
-want to leave it to ldconfig to determine where libraries are.  However,
-for some reason the Perl package puts libperl.so in a nonstandard place
-and doesn't add that place to the ldconfig search path.  I think this
-is a Perl packaging bug, myself, but apparently it's not going to change.
-So work around it by adding an rpath spec to plperl.so (only).
-Per bug #162198.
-
-
-diff -Naur postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile postgresql-9.1.5/src/pl/plperl/GNUmakefile
---- postgresql-9.1.5.orig/src/pl/plperl/GNUmakefile	2012-08-14 18:41:04.000000000 -0400
-+++ postgresql-9.1.5/src/pl/plperl/GNUmakefile	2012-08-17 11:15:09.457116708 -0400
-@@ -43,6 +43,9 @@
- 
- SHLIB_LINK = $(perl_embed_ldflags)
- 
-+# Force rpath to be used even though we disable it everywhere else
-+SHLIB_LINK += $(rpath)
-+
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl  --load-extension=plperlu
- REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
- # if Perl can support two interpreters in one backend,
diff --git a/postgresql.spec b/postgresql.spec
index fef0889..7b3d6f9 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.6
 Version: 9.6.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -105,7 +105,6 @@ Source17: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevv
 # Comments for these patches are in the patch files.
 Patch1: rpm-pgsql.patch
 Patch2: postgresql-logging.patch
-Patch3: postgresql-perl-rpath.patch
 Patch5: postgresql-var-run-socket.patch
 Patch6: postgresql-man.patch
 Patch7: hstore-plperl-data-dumper.patch
@@ -356,7 +355,6 @@ benchmarks.
 %setup -q -a 12
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -1165,6 +1163,9 @@ make -C postgresql-setup-%{setup_version} check
 %endif
 
 %changelog
+* Mon Jul 24 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.3-7
+- drop perl rpath patch; libperl.so* is now in %%_libdir (rhbz#1474417)
+
 * Mon Jun 26 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.3-6
 - don't provide libpqwalreceiver.so() soname