SPECS: apr-util.spec - subpackages for dbd drivers

[glen]

Author: glen                         Date: Sun Jan  1 20:35:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- subpackages for dbd drivers

---- Files affected:
SPECS:
   apr-util.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/apr-util.spec
diff -u SPECS/apr-util.spec:1.37 SPECS/apr-util.spec:1.38
--- SPECS/apr-util.spec:1.37	Sun Jan  1 14:55:40 2006
+++ SPECS/apr-util.spec	Sun Jan  1 21:34:56 2006
@@ -6,17 +6,17 @@
 #
 # Conditional build:
 %bcond_without	ldap	# without LDAP support
-%bcond_with	mysql	# with MySQL support
+%bcond_without	mysql	# with MySQL support
 %bcond_without	pgsql	# without PostgreSQL support
-%bcond_with	sqlite	# with SQLite 2.x support
+%bcond_with	sqlite2	# with SQLite 2.x support
 %bcond_without	sqlite3	# without SQLite3 support
-%bcond_with	dso	# experimental dso linking
+%bcond_without	dso	# experimental dso linking
 #
 Summary:	A companion library to Apache Portable Runtime
 Summary(pl):	Biblioteka towarzysząca Apache Portable Runtime
 Name:		apr-util
 Version:	1.2.2
-Release:	1.18
+Release:	1.20
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
@@ -40,7 +40,7 @@
 %{?with_ldap:BuildRequires:	openldap-devel}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	sed >= 4.0
-%{?with_sqlite:BuildRequires:	sqlite-devel >= 2}
+%{?with_sqlite2:BuildRequires:	sqlite-devel >= 2}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel >= 3}
 Requires:	apr >= 1:1.1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,6 +54,39 @@
 Biblioteka towarzysząca dla biblioteki Apache Portable Runtime
 (przenośnej biblioteki uruchomieniowej).
 
+%package dbd-mysql
+Summary:	DBD driver for MySQL
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+License:	GPL
+
+%description dbd-mysql
+DBD driver for MySQL.
+
+%package dbd-pgsql
+Summary:	DBD driver for PostgreSQL
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-pgsql
+DBD driver for PostgreSQL.
+
+%package dbd-sqlite2
+Summary:	DBD driver for SQLite 2
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-sqlite2
+DBD driver for SQLite 2
+
+%package dbd-sqlite3
+Summary:	DBD driver for SQLite 3
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-sqlite3
+DBD driver for SQLite 3
+
 %package devel
 Summary:	Header files and development documentation for apr-util
 Summary(pl):	Pliki nagłówkowe i dokumentacja programisty do apr-util
@@ -66,7 +99,7 @@
 %{?with_mysql:Requires:	mysql-devel}
 %{?with_ldap:Requires:	openldap-devel}
 %{?with_pgsql:Requires:	postgresql-devel}
-%{?with_sqlite:Requires:	sqlite-devel >= 2}
+%{?with_sqlite2:Requires:	sqlite-devel >= 2}
 %{?with_sqlite3:Requires:	sqlite3-devel >= 3}
 
 %description devel
@@ -117,7 +150,7 @@
 	--with-iconv=%{_prefix} \
 	%{?with_mysql:--with-mysql=%{_prefix}} \
 	%{!?with_pgsql:--without-pgsql} \
-	%{!?with_sqlite:--without-sqlite2} \
+	%{!?with_sqlite2:--without-sqlite2} \
 	%{!?with_sqlite3:--without-sqlite3}
 
 %{__make} \
@@ -135,12 +168,12 @@
 %if %{with pgsql}
 libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_pgsql.lo -lpq  -o dbd/libapr_dbd_pgsql.la
 %endif
+%if %{with sqlite2}
+libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_sqlite2.lo -o dbd/libapr_dbd_sqlite2.la
+%endif
 %if %{with sqlite3}
 libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_sqlite3.lo -lsqlite3 -o dbd/libapr_dbd_sqlite3.la
 %endif
-%if %{with sqlite}
-libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_sqlite2.lo -o dbd/libapr_dbd_sqlite2.la
-%endif
 %endif
 
 %install
@@ -158,14 +191,14 @@
 libtool --mode=install /usr/bin/install -c -m 755 dbd/libapr_dbd_pgsql.la $RPM_BUILD_ROOT%{_libdir}
 mv $RPM_BUILD_ROOT%{_libdir}/{lib,}apr_dbd_pgsql.so
 %endif
+%if %{with sqlite2}
+libtool --mode=install /usr/bin/install -c -m 755 dbd/libapr_dbd_sqlite2.la $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT%{_libdir}/{lib,}apr_dbd_sqlite2.so
+%endif
 %if %{with sqlite3}
 libtool --mode=install /usr/bin/install -c -m 755 dbd/libapr_dbd_sqlite3.la $RPM_BUILD_ROOT%{_libdir}
 mv $RPM_BUILD_ROOT%{_libdir}/{lib,}apr_dbd_sqlite3.so
 %endif
-%if %{with sqlite}
-libtool --mode=install /usr/bin/install -c -m 755 dbd/libapr_dbd_sqlite2.la $RPM_BUILD_ROOT%{_libdir}
-mv $RPM_BUILD_ROOT%{_libdir}/{lib,}apr_dbd_sqlite2.so
-%endif
 %endif
 
 %clean
@@ -177,9 +210,34 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES
-%{?with_mysql:%doc INSTALL.MySQL}
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{?with_dso:%attr(755,root,root) %{_libdir}/apr_dbd_*.so}
+
+%if %{with dso}
+%if %{with mysql}
+%files dbd-mysql
+%defattr(644,root,root,755)
+%doc INSTALL.MySQL
+%attr(755,root,root) %{_libdir}/apr_dbd_mysql.so
+%endif
+
+%if %{with pgsql}
+%files dbd-pgsql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr_dbd_pgsql.so
+%endif
+
+%if %{with sqlite2}
+%files dbd-sqlite2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr_dbd_sqlite2.so
+%endif
+
+%if %{with sqlite3}
+%files dbd-sqlite3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/apr_dbd_sqlite3.so
+%endif
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -200,6 +258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2006/01/01 20:34:56  glen
+- subpackages for dbd drivers
+
 Revision 1.37  2006/01/01 13:55:40  glen
 - experimental dso for dbd
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apr-util.spec?r1=1.37&r2=1.38&f=u