summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Lane <tgl@fedoraproject.org>2005-10-04 22:04:22 +0000
committerTom Lane <tgl@fedoraproject.org>2005-10-04 22:04:22 +0000
commitf718878f5b9e033ae8eceb96a3034d095e078ac6 (patch)
tree31125c84c1d7f2d47386d5f4ac4cf69b2ffc3623
parent32269db0ad6656acc1476a6c689da2c811a73000 (diff)
downloadpostgresql-setup-f718878f5b9e033ae8eceb96a3034d095e078ac6.tar.gz
postgresql-setup-f718878f5b9e033ae8eceb96a3034d095e078ac6.tar.xz
postgresql-setup-f718878f5b9e033ae8eceb96a3034d095e078ac6.zip
Really truly fix bug #162198.postgresql-8_0_4-2
-rw-r--r--postgresql-perl-rpath.patch12
-rwxr-xr-xpostgresql.spec6
2 files changed, 10 insertions, 8 deletions
diff --git a/postgresql-perl-rpath.patch b/postgresql-perl-rpath.patch
index 115d9c0..4d27d10 100644
--- a/postgresql-perl-rpath.patch
+++ b/postgresql-perl-rpath.patch
@@ -9,14 +9,14 @@ Per bug #162198.
diff -Naur postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile postgresql-8.0.4/src/pl/plperl/GNUmakefile
--- postgresql-8.0.4.orig/src/pl/plperl/GNUmakefile 2005-07-17 00:05:49.000000000 -0400
-+++ postgresql-8.0.4/src/pl/plperl/GNUmakefile 2005-10-04 12:15:27.000000000 -0400
-@@ -27,6 +27,9 @@
++++ postgresql-8.0.4/src/pl/plperl/GNUmakefile 2005-10-04 17:40:51.000000000 -0400
+@@ -36,6 +36,9 @@
- rpathdir = $(perl_archlibexp)/CORE
+ SHLIB_LINK = $(perl_embed_ldflags) $(BE_DLLLIBS)
+# Force rpath to be used even though we disable it everywhere else
-+LDFLAGS += $(rpath)
++SHLIB_LINK += $(rpath)
+
+ include $(top_srcdir)/src/Makefile.shlib
+
- NAME = plperl
- SO_MAJOR_VERSION = 0
diff --git a/postgresql.spec b/postgresql.spec
index 1248ba8..acee83f 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Version: 8.0.4
# Pre-release RPM's should not be put up on the public ftp.postgresql.org server
# -- only test releases or full releases should be.
-Release: 1
+Release: 2
License: BSD
Group: Applications/Databases
Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -829,9 +829,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Oct 4 2005 Tom Lane <tgl@redhat.com> 8.0.4-2
+- Add rpath to plperl.so (bug #162198)
+
* Tue Oct 4 2005 Tom Lane <tgl@redhat.com> 8.0.4-1
- Update to PostgreSQL 8.0.4, PyGreSQL 3.6.2, and jdbc driver build 312
-- Add rpath to plperl.so (bug #162198)
- Adjust pgtcl link command to ensure it binds to correct libpq (bug #166665)
- Remove obsolete Conflicts: against other python versions (bug #166754)
- Add /etc/pam.d/postgresql (bug #167040)