From 9a316fe22301e55b250ac2b33d15690019d606bf Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 03:02:46 +0000
Subject: auto-import changelog data from apr-util-0.9.4-10.1.src.rpm

Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
Tue Mar 02 2004 Joe Orton <jorton@redhat.com> 0.9.4-10
- rename sdbm_* symbols to apu__sdbm_*
Mon Feb 16 2004 Joe Orton <jorton@redhat.com> 0.9.4-9
- fix sdbm apr_dbm_exists() on s390x/ppc64
Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 0.9.4-8
- rebuilt
Thu Feb 05 2004 Joe Orton <jorton@redhat.com> 0.9.4-7
- fix warnings from use of apr_optional*.h with gcc 3.4

---

diff --git a/apr-util.spec b/apr-util.spec
index 5b664dd..77a0b28 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 0.9.4
-Release: 6
+Release: 10.1
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -12,6 +12,9 @@ Source0: %{name}-%{version}.tar.gz
 Patch0: apr-util-0.9.3-deplibs.patch
 Patch1: apr-util-0.9.3-config.patch
 Patch2: apr-util-0.9.4-db4.patch
+Patch3: apr-util-0.9.4-gcc34.patch
+Patch4: apr-util-0.9.4-sdbm.patch
+Patch5: apr-util-0.9.4-sdbmnames.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:0.9.4-1
 BuildPrereq: openldap-devel, db4-devel, expat-devel
@@ -41,19 +44,18 @@ library of C data structures and routines.
 %patch0 -p1 -b .deplibs
 %patch1 -p1 -b .config
 %patch2 -p1 -b .db4
+%patch3 -p1 -b .gcc34
+%patch4 -p1 -b .sdbm
+%patch5 -p1 -b .sdbmnames
 
 %build
 autoheader && autoconf
 %configure --with-apr=%{_prefix} \
         --includedir=%{_includedir}/apr-%{apuver} \
         --with-ldap --without-gdbm
+perl -pi -e "s/-Werror//g" build/rules.mk
 make %{?_smp_mflags} && make dox
 
-# Run the less verbose tests
-%define tests testmd5 testrmm teststrmatch testuri
-cd test; make %{tests}
-for t in %{tests}; do ./${t} || exit 1; done
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -64,6 +66,14 @@ mv docs/dox/html html
 # Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/aprutil.exp
 
+%check
+# Run the less verbose tests
+%define tests testmd5 testrmm teststrmatch testuri
+cd test; make %{?_smp_mflags} %{tests} testdbm
+for t in %{tests}; do ./${t} || exit 1; done
+./testdbm auto tsdbm
+./testdbm -tDB auto tbdb.db
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -85,6 +95,21 @@ rm -rf $RPM_BUILD_ROOT
 %doc --parents html
 
 %changelog
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Mar  2 2004 Joe Orton <jorton@redhat.com> 0.9.4-10
+- rename sdbm_* symbols to apu__sdbm_*
+
+* Mon Feb 16 2004 Joe Orton <jorton@redhat.com> 0.9.4-9
+- fix sdbm apr_dbm_exists() on s390x/ppc64
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 0.9.4-8
+- rebuilt
+
+* Thu Feb  5 2004 Joe Orton <jorton@redhat.com> 0.9.4-7
+- fix warnings from use of apr_optional*.h with gcc 3.4
+
 * Thu Jan 29 2004 Joe Orton <jorton@redhat.com> 0.9.4-6
 - drop gdbm support