Author: glen Date: Mon Dec 19 22:37:08 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - succeeded to use dbd mysql
---- Files affected: SPECS: apr-util.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: SPECS/apr-util.spec diff -u SPECS/apr-util.spec:1.32 SPECS/apr-util.spec:1.33 --- SPECS/apr-util.spec:1.32 Mon Dec 19 19:52:08 2005 +++ SPECS/apr-util.spec Mon Dec 19 23:37:02 2005 @@ -1,8 +1,12 @@ # $Revision$, $Date$ +# TODO +# - play with DSO dbd's +# - licensing issues with mysql. can we (PLD Linux) package it inside +# apr-util? see INSTALL.MySQL for more details # # Conditional build: %bcond_without ldap # without LDAP support -%bcond_with mysql # with MySQL support (not fully implemented) +%bcond_with mysql # with MySQL support %bcond_without pgsql # without PostgreSQL support %bcond_with sqlite # with SQLite 2.x support %bcond_without sqlite3 # without SQLite3 support @@ -11,13 +15,16 @@ Summary(pl): Biblioteka towarzysząca Apache Portable Runtime Name: apr-util Version: 1.2.2 -Release: 1 +Release: 1.10 Epoch: 1 License: Apache v2.0 Group: Libraries Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 # Source0-md5: 694228b227e30cb9da3823514516e91c +Source1: http://apache.webthing.com/database/apr_dbd_mysql.c +# Source1-md5: 59d26a91cb7f1492fea9ab3e6cd054fc Patch0: %{name}-link.patch +Patch1: %{name}-mysql.patch URL: http://apr.apache.org/ BuildRequires: apr-devel >= 1:1.1.0 BuildRequires: autoconf @@ -30,6 +37,7 @@ %{?with_pgsql:BuildRequires: postgresql-devel} %{?with_sqlite:BuildRequires: sqlite-devel >= 2} %{?with_sqlite3:BuildRequires: sqlite3-devel >= 3} +%{?with_mysql:BuildRequires: apr-devel >= 1:1.2.2-2.6} Requires: apr >= 1:1.1.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -78,9 +86,14 @@ %prep %setup -q %patch0 -p1 - -# not needed, gen-build.py is not packaged in apr +%patch1 -p1 +%if %{with mysql} +cp %{SOURCE1} dbd/apr_dbd_mysql.c +%else +# not needed, gen-build.py is not packaged in apr-util +# (and it shouldn't apr-devel should have it -glen) %{__perl} -pi -e 's/^(.*gen-build\.py)/#$1/' buildconf +%endif %build ./buildconf \ @@ -94,7 +107,7 @@ --with-ldap-lib=%{_libdir} \ %endif --with-iconv=%{_prefix} \ - %{?with_mysql:--with-mysql} \ + %{?with_mysql:--with-mysql=%{_prefix}} \ %{!?with_pgsql:--without-pgsql} \ %{!?with_sqlite:--without-sqlite2} \ %{!?with_sqlite3:--without-sqlite3} @@ -116,6 +129,7 @@ %files %defattr(644,root,root,755) %doc CHANGES +%{?with_mysql:%doc INSTALL.MySQL} %attr(755,root,root) %{_libdir}/lib*.so.*.* %files devel @@ -137,6 +151,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.33 2005/12/19 22:37:02 glen +- succeeded to use dbd mysql + Revision 1.32 2005/12/19 18:52:08 glen - mysql not implemented ;/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apr-util.spec?r1=1.32&r2=1.33&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
