Bump up to 1.3.4.

.cvsignore

@@ -1 +1 @@
-apr-util-1.3.2.tar.bz2
+apr-util-1.3.4.tar.bz2

apr-util-1.3.2-pgsql.patch

@@ -1,119 +0,0 @@
-Index: build/dbd.m4
-===================================================================
---- build/dbd.m4	(revision 672960)
-+++ build/dbd.m4	(working copy)
-@@ -35,16 +35,32 @@
-       if test "x$PGSQL_CONFIG" != 'x'; then
-         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-         pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
--        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
- 
-         APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
-         APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
--        APR_ADDTO(LIBS, [$pgsql_LIBS])
-       fi
- 
--      AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
-+      AC_CHECK_HEADERS(libpq-fe.h, [
-+        AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
-+        if test "x$PGSQL_CONFIG" != 'x'; then
-+          unset ac_cv_lib_pq_PQsendQueryPrepared
-+          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+          APR_ADDTO(LIBS, [$pgsql_LIBS])
-+          AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
-+        fi
-+        ])
-+      ])
-       if test "$apu_have_pgsql" = "0"; then
--        AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
-+        AC_CHECK_HEADERS(postgresql/libpq-fe.h, [
-+          AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
-+          if test "x$PGSQL_CONFIG" != 'x'; then
-+            unset ac_cv_lib_pq_PQsendQueryPrepared
-+            pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+            APR_ADDTO(LIBS, [$pgsql_LIBS])
-+            AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
-+          fi
-+          ])
-+        ])
-       fi
-       if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
-         APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
-@@ -56,7 +72,6 @@
-       if test "x$PGSQL_CONFIG" != 'x'; then
-         pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-         pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
--        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-       else
-         pgsql_CPPFLAGS="-I$withval/include"
-         pgsql_LDFLAGS="-L$withval/lib "
-@@ -64,12 +79,29 @@
- 
-       APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
-       APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
--      APR_ADDTO(LIBS, [$pgsql_LIBS])
- 
-       AC_MSG_NOTICE(checking for pgsql in $withval)
--      AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
-+      AC_CHECK_HEADERS(libpq-fe.h, [
-+        AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
-+        if test "x$PGSQL_CONFIG" != 'x'; then
-+          unset ac_cv_lib_pq_PQsendQueryPrepared
-+          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+          APR_ADDTO(LIBS, [$pgsql_LIBS])
-+          AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
-+        fi
-+        ])
-+      ])
-       if test "$apu_have_pgsql" != "1"; then
--        AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
-+        AC_CHECK_HEADERS(postgresql/libpq-fe.h, [
-+          AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
-+          if test "x$PGSQL_CONFIG" != 'x'; then
-+            unset ac_cv_lib_pq_PQsendQueryPrepared
-+            pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+            APR_ADDTO(LIBS, [$pgsql_LIBS])
-+            AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
-+          fi
-+          ])
-+        ])
-       fi
-       if test "$apu_have_pgsql" != "0"; then
-         APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
-@@ -80,16 +112,32 @@
-     if test "x$PGSQL_CONFIG" != 'x'; then
-       pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
-       pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
--      pgsql_LIBS="`$PGSQL_CONFIG --libs`"
- 
-       APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
-       APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
--      APR_ADDTO(LIBS, [$pgsql_LIBS])
-     fi
- 
--    AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
-+    AC_CHECK_HEADERS(libpq-fe.h, [
-+      AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
-+      if test "x$PGSQL_CONFIG" != 'x'; then
-+        unset ac_cv_lib_pq_PQsendQueryPrepared
-+        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+        APR_ADDTO(LIBS, [$pgsql_LIBS])
-+        AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
-+      fi
-+      ])
-+    ])
-     if test "$apu_have_pgsql" = "0"; then
--      AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
-+      AC_CHECK_HEADERS(postgresql/libpq-fe.h, [
-+        AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
-+        if test "x$PGSQL_CONFIG" != 'x'; then
-+          unset ac_cv_lib_pq_PQsendQueryPrepared
-+          pgsql_LIBS="`$PGSQL_CONFIG --libs`"
-+          APR_ADDTO(LIBS, [$pgsql_LIBS])
-+          AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
-+        fi
-+        ])
-+      ])
-     fi
-     if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
-       APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])

apr-util-1.3.2.tar.bz2.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iQIVAwUASFe814FUZ7bLm57FAQKOrw//aWeSATNN0GYThQp9xyQ6BBfV7Lrva9cW
-nm88miNIr+wPrSnoUtReRzigNzIK4TvHpEtAAKeef36g+yC6W4WElswThwNMNdTl
-yngln9lErhUkt4foVceBG5iLF8FPrkmHgq5BbJD6RnUhKJqGdpiHI2b35KHrIwvd
-Ly9eTOoFT+Pr9eu5CepJlOLkFFn9OwqrpadUQhhASB83W4z7b7vKD/e1B1eS8iqV
-pOovLPd1aO2hkDmu/++eQhUzAL+XbHLxlpd1vMb1D2BJ+LkQDllDnqDEPsVoT4i3
-9Cr1jyLyA8W57QVgyQVBya+FGjby7iP/TkXCv2cG8Q5Xh/kQF3yYO/EaOzb2JMxe
-YqJ9tGoEOeJYxUAvCMlz+qtcSyo13XNTojwI3GzzLVgmZRp004LDBn0jurbi+BZr
-WGb5snnnsVb0ZVfDyWtP0/GVTYTeeBvT+Mplp+Muh/Jy/u8qGwV5fW3aHkbEBdPZ
-R4fvDGB9draKKsurz/Z4EdsQZstiY+m30vxzpT+5Qcpr2nqRzXCHBZgmrxXnYJf3
-TfJJJpgJdYEjVv/iytkGDrMBSwIQSyZ9BeQUKiCxv62T4UL5wAFo/crLK9+ozcVP
-TzJGAen5o9sPPIpYOHRG14XHDJYQtWMBTKZCul3uIoIdcUwfcnlfLHoZqIPCIL1L
-XK3kAomri88=
-=Jvvr
------END PGP SIGNATURE-----

apr-util-1.3.4.tar.bz2.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iQIVAwUASKPDgYFUZ7bLm57FAQLWUQ/+NcCpkXJ8+3joda1aChkCPmFfV7AKbJ6v
++orAxp2kDV1TQxcL6YZLIzLsKK+kdk5R4XX0gC95YfVCutNjBmXKwhGbTHYDG+6t
+pqgnd0rcMxm8xGstE8Q9bRqBfgmjMNVXLSf9Fwo80cEc1bxBmerZ0DGIAD/P08GO
+87/JOGbiwQti2izzYqj4xeMz1b+ZSOM/eEiwVJrEcR7eCOOTN2mQ4bHbIijxdwBP
+yUhxXI5sYQbcbOTMA+sIkSjEDq+xo6aJsjA+EE34/7eW5GVx4nnJs/9B0Sy5LGL8
+pkj2YAGZaGks0dsCGfq2FP0ybwhebgxhut7jLQCd4iU8dUWZjUEauuOBVdChlgq8
+akqkJS/9rWJh4cboDqqYko7cESDFR4qw7uBN2rrojpcIlIfG9iQzNMEHkWKd6Fhe
+NoJ/6s1EWDXJ4TIARcoTMvRSYSFkL1O87yO3wrNogC4NHKgzfh6GmEDUqimvCTRN
+CAj5NXFhx4FC9eLB0fWwPUVI1W/A4hOFy0uk6eaWoAzhm85SifJDZbgkUiiFgmBh
+6iBqgCLuiyAbaE8pwEUlVlv9idmP0YPzIhcUsIoXw7ZhyI3BItKrGTIv2cDDuq9d
+W1LEdCrzvEE1YmzS0cV6XzR+9Fq3FCGinR5+s0vBhQmCnlyEECjci3YcepdGLVyw
+lBNStwOSf1k=
+=zf2I
+-----END PGP SIGNATURE-----

apr-util.spec

@@ -3,14 +3,13 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.3.2
+Version: 1.3.4
 Release: 8%{?dist}
 License: ASL 2.0
 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
@@ -95,7 +94,6 @@ This package provides the LDAP support for the apr-util.
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
-%patch2 -p0 -b .pgsql
 
 %build
 autoheader && autoconf
@@ -187,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Wed Aug 16 2008 Bojan Smojver <bojan@rexursive.com> - 1.3.4-1
+- bump up to 1.3.4
+- drop PostgreSQL patch, fixed upstream
+
 * Wed Jul 16 2008 Bojan Smojver <bojan@rexursive.com> - 1.3.2-8
 - beat the fuzz, rework apr-util-1.2.7-pkgconf.patch
 

sources

@@ -1 +1 @@
-aa782fb9ced8b59c8e99419d8cdd1981  apr-util-1.3.2.tar.bz2
+adfbe525cf3914cf769340e8f6a6d14b  apr-util-1.3.4.tar.bz2