rpms/postgresql/FC-3 postgresql-plperl.patch, 1.1, 1.2 postgresql.spec, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: tgl

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

Modified Files:
	postgresql-plperl.patch postgresql.spec 
Log Message:
Fix a couple of problems noted while trying to build this package with
FC-4 tools.  We're not really supporting this branch anymore, but may
as well preserve the work.

postgresql-plperl.patch:
 GNUmakefile |    2 ++
 1 files changed, 2 insertions(+)

Index: postgresql-plperl.patch
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-3/postgresql-plperl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postgresql-plperl.patch	9 Sep 2004 10:42:45 -0000	1.1
+++ postgresql-plperl.patch	4 Oct 2005 19:53:05 -0000	1.2
@@ -1,9 +1,12 @@
-Index: postgresql-7.3.4/src/pl/plperl/GNUmakefile
-===================================================================
-RCS file: /projects/cvsroot/pgsql-server/src/pl/plperl/GNUmakefile,v
-retrieving revision 1.10
-diff -r1.10 GNUmakefile
-18c18
-< override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS))
----
-> override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS), -Wl,-rpath,$(perl_archlibexp)/CORE) 
+diff -Naur postgresql-7.4.8.orig/src/pl/plperl/GNUmakefile postgresql-7.4.8/src/pl/plperl/GNUmakefile
+--- postgresql-7.4.8.orig/src/pl/plperl/GNUmakefile	2004-01-21 14:25:11.000000000 -0500
++++ postgresql-7.4.8/src/pl/plperl/GNUmakefile	2005-10-04 12:48:49.000000000 -0400
+@@ -18,6 +18,8 @@
+ override CFLAGS := $(filter-out -Wall -Wmissing-declarations -Wmissing-prototypes, $(CFLAGS))
+ endif
+ 
++override CFLAGS += -Wl,-rpath,$(perl_archlibexp)/CORE
++
+ override CPPFLAGS := -I$(srcdir) -I$(perl_archlibexp)/CORE $(CPPFLAGS)
+ 
+ 


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-3/postgresql.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- postgresql.spec	10 May 2005 17:02:35 -0000	1.42
+++ postgresql.spec	4 Oct 2005 19:53:05 -0000	1.43
@@ -804,10 +804,7 @@
 %if %jdbc
 %files jdbc
 %defattr(-,root,root)
-%{_datadir}/java/pg74.215.jdbc1.jar
-%{_datadir}/java/pg74.215.jdbc2.jar
-%{_datadir}/java/pg74.215.jdbc2ee.jar
-%{_datadir}/java/pg74.215.jdbc3.jar
+%{_datadir}/java/*
 %endif
 
 %if %test