Update the RPM spec file to depend on the bzip2 binary instead of the gzip

binary. Include the formal path to the source, to match the Fedora spec file.
Create separate discrete packages corresponding to the DBD and LDAP modules,
as per Bojan Smojver's changes to the Fedora spec file.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@690551 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 92 insertions, 7 deletions

diff --git a/build/rpm/apr-util.spec.in b/build/rpm/apr-util.spec.in
index 3b9ef811..cb245f25 100644
--- a/build/rpm/apr-util.spec.in
+++ b/build/rpm/apr-util.spec.in
@@ -8,11 +8,10 @@ Release: APU_RELEASE
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release}
-BuildPrereq: openldap-devel, db4-devel, expat-devel
-Conflicts: subversion < 0.20.1-2
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 1.3.0
+BuildPrereq: db4-devel, expat-devel
 
 %description
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -24,8 +23,7 @@ for XML, LDAP, database interfaces, URI parsing and more.
 Group: Development/Libraries
 Summary: APR utility library development kit
 Requires: apr-util = %{version}-%{release}, apr-devel
-Requires: openldap-devel, db4-devel, expat-devel
-Conflicts: subversion-devel < 0.20.1-2
+Requires: db4-devel, expat-devel
 
 %description devel
 This package provides the support files which can be used to 
@@ -33,13 +31,75 @@ build applications using the APR utility library.  The mission
 of the Apache Portable Runtime (APR) is to provide a free 
 library of C data structures and routines.
 
+%package pgsql
+Group: Development/Libraries
+Summary: APR utility library PostgreSQL DBD driver
+BuildRequires: postgresql-devel
+Requires: apr-util = %{version}-%{release}
+
+%description pgsql
+This package provides the PostgreSQL driver for the apr-util
+DBD (database abstraction) interface.
+
+%package mysql
+Group: Development/Libraries
+Summary: APR utility library MySQL DBD driver
+BuildRequires: mysql-devel
+Requires: apr-util = %{version}-%{release}
+
+%description mysql
+This package provides the MySQL driver for the apr-util DBD
+(database abstraction) interface.
+
+%package sqlite
+Group: Development/Libraries
+Summary: APR utility library SQLite DBD driver
+BuildRequires: sqlite-devel >= 3.0.0
+Requires: apr-util = %{version}-%{release}
+
+%description sqlite
+This package provides the SQLite driver for the apr-util DBD
+(database abstraction) interface.
+
+%package freetds
+Group: Development/Libraries
+Summary: APR utility library FreeTDS DBD driver
+BuildRequires: freetds-devel
+Requires: apr-util = %{version}-%{release}
+
+%description freetds
+This package provides the FreeTDS driver for the apr-util DBD
+(database abstraction) interface.
+
+%package odbc
+Group: Development/Libraries
+Summary: APR utility library ODBC DBD driver
+BuildRequires: unixODBC-devel
+Requires: apr-util = %{version}-%{release}
+
+%description odbc
+This package provides the ODBC driver for the apr-util DBD
+(database abstraction) interface.
+
+%package ldap
+Group: Development/Libraries
+Summary: APR utility library LDAP support
+BuildRequires: openldap-devel
+Requires: apr-util = %{version}-%{release}
+
+%description ldap
+This package provides the LDAP support for the apr-util.
+
 %prep
 %setup -q
 
 %build
 %configure --with-apr=%{_prefix} \
         --includedir=%{_includedir}/apr-%{apuver} \
-        --with-ldap --without-gdbm
+        --with-ldap --without-gdbm \
+        --with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \
+        --with-berkeley-db \
+        --without-sqlite2
 make %{?_smp_mflags} && make dox
 
 %check
@@ -70,6 +130,31 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
+%dir %{_libdir}/apr-util-%{apuver}
+
+%files pgsql
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql*
+
+%files mysql
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_dbd_mysql*
+
+%files sqlite
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
+
+%files freetds
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_dbd_freetds*
+
+%files odbc
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_dbd_odbc*
+
+%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_ldap*
 
 %files devel
 %defattr(-,root,root,-)