rpms/postgresql/devel postgresql-perl-rpath.patch, 1.1, 1.2 postgresql.spec, 1.51, 1.52

[fedora-cvs-commits at redhat.com]

Author: tgl

Update of /cvs/dist/rpms/postgresql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22320

Modified Files:
	postgresql-perl-rpath.patch postgresql.spec 
Log Message:
Really truly fix bug #162198.

postgresql-perl-rpath.patch:
 GNUmakefile |    3 +++
 1 files changed, 3 insertions(+)

Index: postgresql-perl-rpath.patch
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/postgresql-perl-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-perl-rpath.patch	4 Oct 2005 19:37:36 -0000	1.1
+++ postgresql-perl-rpath.patch	4 Oct 2005 22:04:22 -0000	1.2
@@ -9,14 +9,14 @@
 
 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


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- postgresql.spec	4 Oct 2005 19:37:36 -0000	1.51
+++ postgresql.spec	4 Oct 2005 22:04:22 -0000	1.52
@@ -64,7 +64,7 @@
 # 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 @@
 %endif
 
 %changelog
+* Tue Oct  4 2005 Tom Lane <tgl at redhat.com> 8.0.4-2
+- Add rpath to plperl.so (bug #162198)
+
 * Tue Oct  4 2005 Tom Lane <tgl at 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)