diff --git a/apr-util-1.3.2-pgsql.patch b/apr-util-1.3.2-pgsql.patch new file mode 100644 index 0000000..6d29f0b --- /dev/null +++ b/apr-util-1.3.2-pgsql.patch @@ -0,0 +1,13 @@ +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]) diff --git a/apr-util.spec b/apr-util.spec index 1602cac..af5337d 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -10,6 +10,7 @@ Group: System Environment/Libraries 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 @@ This package provides the LDAP support for the apr-util. %prep %setup -q %patch1 -p1 -b .pkgconf +%patch1 -p0 -b .pgsql %build autoheader && autoconf @@ -183,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Jul 2 2008 Bojan Smojver - 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 - 1.3.2-2 - try adding postgresql-server to build dependencies to pull some libs in