-# 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
+%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_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.10
+Version: 1.2.6
+Release: 1
Epoch: 1
License: Apache v2.0
Group: Libraries
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: 694228b227e30cb9da3823514516e91c
-# http://apache.webthing.com/database/apr_dbd_mysql.c, our is modified
+# Source0-md5: c168c2bb833fe8032c5eb9688a45cc28
+# http://apache.webthing.com/database/apr_dbd_mysql.c
Source1: apr_dbd_mysql.c
Patch0: %{name}-link.patch
Patch1: %{name}-mysql.patch
+Patch2: %{name}-dso.patch
+Patch3: %{name}-dbd.patch
URL: http://apr.apache.org/
BuildRequires: apr-devel >= 1:1.1.0
+%{?with_mysql:BuildRequires: apr-devel >= 1:1.2.2-2.6}
BuildRequires: autoconf
BuildRequires: db-devel
BuildRequires: expat-devel
BuildRequires: gdbm-devel
BuildRequires: libtool
%{?with_mysql:BuildRequires: mysql-devel}
-%{?with_ldap:BuildRequires: openldap-devel}
+%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
%{?with_pgsql:BuildRequires: postgresql-devel}
-%{?with_sqlite:BuildRequires: sqlite-devel >= 2}
+BuildRequires: sed >= 4.0
+%{?with_sqlite2: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)
Biblioteka towarzysz±ca dla biblioteki Apache Portable Runtime
(przeno¶nej biblioteki uruchomieniowej).
+%package dbd-mysql
+Summary: DBD driver for MySQL
+Summary(pl): Sterownik DBD dla MySQL-a
+License: GPL
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-mysql
+DBD driver for MySQL.
+
+%description dbd-mysql -l pl
+Sterownik DBD dla MySQL-a.
+
+%package dbd-pgsql
+Summary: DBD driver for PostgreSQL
+Summary(pl): Sterownik DBD dla PostgreSQL-a
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-pgsql
+DBD driver for PostgreSQL.
+
+%description dbd-pgsql -l pl
+Sterownik DBD dla PostgreSQL-a.
+
+%package dbd-sqlite2
+Summary: DBD driver for SQLite 2
+Summary(pl): Sterownik DBD dla SQLite 2
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-sqlite2
+DBD driver for SQLite 2.
+
+%description dbd-sqlite2 -l pl
+Sterownik DBD dla SQLite 2.
+
+%package dbd-sqlite3
+Summary: DBD driver for SQLite 3
+Summary(pl): Sterownik DBD dla SQLite 3
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description dbd-sqlite3
+DBD driver for SQLite 3.
+
+%description dbd-sqlite3 -l pl
+Sterownik DBD dla SQLite 3.
+
%package devel
Summary: Header files and development documentation for apr-util
Summary(pl): Pliki nag³ówkowe i dokumentacja programisty do apr-util
Requires: db-devel
Requires: expat-devel
Requires: gdbm-devel
-%{?with_mysql:Requires: mysql-devel}
-%{?with_ldap:Requires: openldap-devel}
-%{?with_pgsql:Requires: postgresql-devel}
-%{?with_sqlite:Requires: sqlite-devel >= 2}
-%{?with_sqlite3:Requires: sqlite3-devel >= 3}
+%{?with_ldap:Requires: openldap-devel >= 2.3.0}
%description devel
Header files and development documentation for apr-util.
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
+# (and it shouldn't: apr-devel should have it -glen)
+%{__sed} -i -e 's/^\(.*gen-build\.py\)/#\1/' buildconf
+%endif
+%if %{with dso}
+%patch2 -p1
+%patch3 -p1
%endif
+rm -rf xml/expat
+
%build
./buildconf \
--with-apr=%{_datadir}/apr
+%if %{with dso}
+%{__sed} -i -e '/OBJECTS_all/s, dbd/apr_dbd_[^ ]*\.lo,,g' build-outputs.mk
+%endif
%configure \
--with-apr=%{_bindir}/apr-1-config \
--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}
+%{__make} \
+ CC="%{__cc}"
+
+%if %{with dso}
+%if %{with mysql}
+%{__make} dbd/apr_dbd_mysql.lo
+libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_mysql.lo -lmysqlclient_r -o dbd/libapr_dbd_mysql.la
+%endif
+%if %{with pgsql}
+%{__make} dbd/apr_dbd_pgsql.lo
+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}
+%{__make} dbd/apr_dbd_sqlite2.lo
+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}
+%{__make} dbd/apr_dbd_sqlite3.lo
+libtool --mode=link --tag=CC %{__cc} -rpath %{_libdir} -avoid-version dbd/apr_dbd_sqlite3.lo -lsqlite3 -o dbd/libapr_dbd_sqlite3.la
+%endif
+%endif
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+
+%if %{with dso}
+%if %{with mysql}
+libtool --mode=install /usr/bin/install -c -m 755 dbd/libapr_dbd_mysql.la $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT%{_libdir}/{lib,}apr_dbd_mysql.so
+%endif
+%if %{with pgsql}
+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
+rm -f $RPM_BUILD_ROOT%{_libdir}/libapr_dbd_*.la
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc CHANGES
-%{?with_mysql:%doc INSTALL.MySQL}
%attr(755,root,root) %{_libdir}/lib*.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)
%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libaprutil*.so
%{_libdir}/lib*.la
%{_libdir}/aprutil.exp
%{_includedir}
projects / packages / apr-util.git / blobdiff