- add mysql driver in -mysql subpackage (Bojan Smojver, #222237)

apr-util-1.2.8-dbddso.patch

@@ -96,7 +96,7 @@
  
  OBJECTS_unix = $(OBJECTS_all)
  
-@@ -58,10 +55,33 @@
+@@ -58,10 +55,34 @@
  
  OBJECTS_os390 = $(OBJECTS_all)
  
@@ -109,24 +109,25 @@
 +OBJECTS_dbd_pgsql = dbd/apr_dbd_pgsql.lo
 +MODULE_dbd_pgsql = dbd/apr_dbd_pgsql.la
 +dbd/apr_dbd_pgsql.la: dbd/apr_dbd_pgsql.lo
-+	$(LINK_MODULE) -o $@ dbd/apr_dbd_pgsql.lo $(LDADD_dbd_pgsql)
++	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_pgsql) $(LDADD_dbd_pgsql)
 +
 +dbd/apr_dbd_sqlite2.lo: dbd/apr_dbd_sqlite2.c .make.dirs include/apu.h include/private/apr_dbd_internal.h include/apr_dbd.h
 +OBJECTS_dbd_sqlite2 = dbd/apr_dbd_sqlite2.lo
 +MODULE_dbd_sqlite2 = dbd/apr_dbd_sqlite2.la
 +dbd/apr_dbd_sqlite2.la: dbd/apr_dbd_sqlite2.lo
-+	$(LINK_MODULE) -o $@ dbd/apr_dbd_sqlite2.lo $(LDADD_dbd_sqlite2)
++	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_sqlite2) $(LDADD_dbd_sqlite2)
 +
 +dbd/apr_dbd_sqlite3.lo: dbd/apr_dbd_sqlite3.c .make.dirs include/apu.h include/private/apr_dbd_internal.h include/apr_dbd.h
 +OBJECTS_dbd_sqlite3 = dbd/apr_dbd_sqlite3.lo
 +MODULE_dbd_sqlite3 = dbd/apr_dbd_sqlite3.la
 +dbd/apr_dbd_sqlite3.la: dbd/apr_dbd_sqlite3.lo
-+	$(LINK_MODULE) -o $@ dbd/apr_dbd_sqlite3.lo $(LDADD_dbd_sqlite3)
++	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_sqlite3) $(LDADD_dbd_sqlite3)
 +
-+OBJECTS_dbd_mysql = 
++dbd/apr_dbd_mysql.lo: dbd/apr_dbd_mysql.c .make.dirs include/apu.h include/private/apr_dbd_internal.h include/private/apu_config.h include/apu_version.h include/apr_buckets.h include/apr_dbd.h
++OBJECTS_dbd_mysql = dbd/apr_dbd_mysql.lo
 +MODULE_dbd_mysql = dbd/apr_dbd_mysql.la
-+dbd/apr_dbd_mysql.la: 
++dbd/apr_dbd_mysql.la: dbd/apr_dbd_mysql.lo
-+	$(LINK_MODULE) -o $@  $(LDADD_dbd_mysql)
++	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_mysql) $(LDADD_dbd_mysql)
 +
  BUILD_DIRS = buckets crypto dbd dbm dbm/sdbm encoding hooks ldap misc strmatch uri xlate xml
  

apr-util.spec

@@ -4,19 +4,19 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.8
-Release: 3
+Release: 4
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
-Source0: %{name}-%{version}.tar.gz
+Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
+Source1: http://apache.webthing.com/svn/apache/apr/apr_dbd_mysql.c
 Patch0: apr-util-1.2.2-exports.patch
 Patch2: apr-util-1.2.7-pkgconf.patch
 Patch3: apr-util-1.2.8-dbddso.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
 BuildRequires: openldap-devel, db4-devel, expat-devel
-BuildRequires: postgresql-devel, sqlite-devel >= 3.0.0
+BuildRequires: sqlite-devel >= 3.0.0, e2fsprogs-devel
-BuildRequires: e2fsprogs-devel
 Conflicts: subversion < 0.20.1-2
 
 %description
@@ -41,24 +41,36 @@ 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.
+
 %prep
 %setup -q
 %patch0 -p1 -b .exports
 %patch2 -p1 -b .pkgconf
 %patch3 -p1 -b .dbddso
+cp $RPM_SOURCE_DIR/apr_dbd_mysql.c dbd
 
 %build
 autoheader && autoconf
 %configure --with-apr=%{_prefix} \
         --includedir=%{_includedir}/apr-%{apuver} \
         --with-ldap --without-gdbm \
-        --with-sqlite3 --with-pgsql \
+        --with-sqlite3 --with-pgsql --with-mysql \
         --with-berkeley-db \
         --without-sqlite2 \
         --enable-dbd-dso
@@ -116,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql*
 
+%files mysql
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_dbd_mysql*
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/apu-%{apuver}-config
@@ -126,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc --parents html
 
 %changelog
+* Wed Feb 28 2007 Joe Orton <jorton@redhat.com> 1.2.8-4
+- add mysql driver in -mysql subpackage (Bojan Smojver, #222237)
+
 * Tue Feb 27 2007 Joe Orton <jorton@redhat.com> 1.2.8-3
 - build DBD drivers as DSOs (w/Bojan Smojver, #192922)
 - split out pgsql driver into -pgsql subpackage