- update to 1.2.2

apr-util.spec

@@ -1,18 +1,18 @@
 
-%define apuver 0
+%define apuver 1
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 0.9.7
-Release: 3
+Version: 1.2.2
+Release: 1
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
-Patch0: apr-util-0.9.3-deplibs.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
+BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
+BuildRequires: openldap-devel, db4-devel, expat-devel
+BuildRequires: postgresql-devel, sqlite-devel
 Conflicts: subversion < 0.20.1-2
 
 %description
@@ -36,13 +36,13 @@ library of C data structures and routines.
 
 %prep
 %setup -q
-%patch0 -p1 -b .deplibs
 
 %build
 autoheader && autoconf
 %configure --with-apr=%{_prefix} \
         --includedir=%{_includedir}/apr-%{apuver} \
-        --with-ldap --without-gdbm
+        --with-ldap --without-gdbm \
+        --with-sqlite3 --with-pgsql
 make %{?_smp_mflags} && make dox
 
 %install
@@ -58,14 +58,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/aprutil.exp \
 
 # And remove the reference to the static libaprutil from the .la
 # file.
-sed -i '/^old_library/s,libapr.*\.a,,'  \
+sed -i '/^old_library/s,libapr.*\.a,,' \
       $RPM_BUILD_ROOT%{_libdir}/libapr*.la
 
 %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
+# Run the less verbose test suites
+cd test
+make %{?_smp_mflags} testall testrmm testdbm
+./testall -v -q
+./testrmm
 ./testdbm auto tsdbm
 ./testdbm -tDB auto tbdb.db
 
@@ -83,13 +84,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/apu-config
+%{_bindir}/apu-%{apuver}-config
 %{_libdir}/libaprutil-%{apuver}.*a
 %{_libdir}/libaprutil-%{apuver}.so
 %{_includedir}/apr-%{apuver}/*.h
+%{_libdir}/pkgconfig/*.pc
 %doc --parents html
 
 %changelog
+* Fri Nov 25 2005 Joe Orton <jorton@redhat.com> 1.2.2-1
+- update to 1.2.2
+
 * Thu Oct 20 2005 Joe Orton <jorton@redhat.com> 0.9.7-3
 - fix epoch again
 

sources

@@ -1 +1 @@
-6afa5f2866537639dc2d248eb7219e01  apr-util-0.9.7.tar.gz
+8b3f04dde7048946c3c94f85b4debb94  apr-util-1.2.2.tar.gz

upstream

@@ -1 +1 @@
-apr-util-0.9.7.tar.gz
+apr-util-1.2.2.tar.gz