rpms/apr-util/devel apr-util-1.3.2-pgsql.patch, NONE, 1.1 apr-util.spec, 1.51, 1.52

[Bojan Smojver (bojan)]

Author: bojan

Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8177

Modified Files:
	apr-util.spec 
Added Files:
	apr-util-1.3.2-pgsql.patch 
Log Message:
Add apr-util-1.3.2-pgsql.patch (remove pgsql_LIBS during detection).

apr-util-1.3.2-pgsql.patch:

--- NEW FILE apr-util-1.3.2-pgsql.patch ---
Index: build/dbd.m4
===================================================================
--- build/dbd.m4	(revision 672960)
+++ build/dbd.m4	(working copy)
@@ -35,7 +35,7 @@
       if test "x$PGSQL_CONFIG" != 'x'; then
         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
         pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
-        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
+        pgsql_LIBS=""
 
         APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
         APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])


Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- apr-util.spec	2 Jul 2008 06:01:10 -0000	1.51
+++ apr-util.spec	2 Jul 2008 06:11:51 -0000	1.52
@@ -10,6 +10,7 @@
 URL: http://apr.apache.org/
 Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
+Patch2: apr-util-1.3.2-pgsql.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, apr-devel >= 1.3.0
 BuildRequires: db4-devel, expat-devel, e2fsprogs-devel
@@ -94,6 +95,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
+%patch1 -p0 -b .pgsql
 
 %build
 autoheader && autoconf
@@ -183,6 +185,7 @@
 %changelog
 * Wed Jul  2 2008 Bojan Smojver <bojan at rexursive.com> - 1.3.2-3
 - revert build dependencies, change from -2 didn't help
+- add apr-util-1.3.2-pgsql.patch (remove pgsql_LIBS during detection)
 
 * Wed Jul  2 2008 Bojan Smojver <bojan at rexursive.com> - 1.3.2-2
 - try adding postgresql-server to build dependencies to pull some libs in