X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apr-util.spec;h=2074e368e1b46f3594751914de22d0284d0fff49;hb=master;hp=ba4d5061587c37391e095fb20100210b0923bac5;hpb=13d9c390cbe0d886b31d141dd5426f350037b410;p=packages%2Fapr-util.git diff --git a/apr-util.spec b/apr-util.spec index ba4d506..2074e36 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -1,44 +1,67 @@ +# NOTE: drop freetds bcond if/when upstream removes the rest of dbd-freetds code # # Conditional build: -%bcond_without ldap # without LDAP support -%bcond_without mysql # with MySQL support -%bcond_without pgsql # without PostgreSQL support -%bcond_with sqlite2 # with SQLite 2.x support -%bcond_without sqlite3 # without SQLite3 support -%bcond_without dso # experimental dso linking -# +%bcond_with freetds # without FreeTDS (sybdb) DBD module [unsupported since 1.6.0] +%bcond_without mysql # without MySQL DBD module +%bcond_without odbc # without ODBC DBD module +%bcond_with oracle # with Oracle DBD module (BR: proprietary libs) +%bcond_without pgsql # without PostgreSQL DBD module +%bcond_with sqlite2 # with SQLite 2.x DBD module +%bcond_without sqlite3 # without SQLite3 DBD module +%bcond_without ldap # without LDAP module +%bcond_without nss # without NSS crypto module +%bcond_without openssl # without OpenSSL crypto module +%bcond_without tests # don't perform "make check" + +# define dbver db50 +%if 0%{!?dbver:1} + %if "%{pld_release}" == "th" + %define dbver db53 + %endif + %if "%{pld_release}" == "ac" + %define dbver db42 + %endif +%endif + Summary: A companion library to Apache Portable Runtime Summary(pl.UTF-8): Biblioteka towarzysząca Apache Portable Runtime Name: apr-util -Version: 1.2.10 -Release: 4 +Version: 1.6.3 +Release: 1 Epoch: 1 License: Apache v2.0 Group: Libraries Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 -# Source0-md5: 9277c21fe41065bd359db98c474aa998 -# http://apache.webthing.com/database/apr_dbd_mysql.c -Source1: apr_dbd_mysql.c +# Source0-md5: b6e8c9b31d938fe5797ceb0d1ff2eb69 Patch0: %{name}-link.patch -Patch1: %{name}-dso.patch -Patch2: %{name}-dbd.patch -Patch3: %{name}-db45.patch -Patch4: %{name}-mysql-link.patch +Patch1: %{name}-config-noldap.patch + +Patch3: %{name}-flags.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 >= 4.6 +BuildRequires: apr-devel >= 1:1.6.0 +BuildRequires: autoconf >= 2.59 +%if "%{pld_release}" == "th" +BuildRequires: db-devel >= 4.7 +%endif +%if "%{pld_release}" == "ac" +BuildRequires: db-devel >= 4.2 +BuildConflicts: db4.5-devel +%endif BuildRequires: expat-devel -BuildRequires: gdbm-devel +%{?with_freetds:BuildRequires: freetds-devel} BuildRequires: libtool %{?with_mysql:BuildRequires: mysql-devel} -%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6} +%{?with_nss:BuildRequires: nss-devel} +%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0} +%{?with_openssl:BuildRequires: openssl-devel} %{?with_pgsql:BuildRequires: postgresql-devel} -BuildRequires: sed >= 4.0 +BuildRequires: rpm >= 4.4.9-56 %{?with_sqlite2:BuildRequires: sqlite-devel >= 2} %{?with_sqlite3:BuildRequires: sqlite3-devel >= 3} -Requires: apr >= 1:1.1.0 +%{?with_odbc:BuildRequires: unixODBC-devel} +BuildRequires: which +Requires: apr >= 1:1.6.0 +%{!?with_freetds:Obsoletes: apr-util-dbd-freetds} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _includedir /usr/include/apr-util @@ -50,6 +73,42 @@ A companion library to Apache Portable Runtime. Biblioteka towarzysząca dla biblioteki Apache Portable Runtime (przenośnej biblioteki uruchomieniowej). +%package crypto-nss +Summary: APR cryptographic module using Mozilla NSS library +Summary(pl.UTF-8): Moduł kryptograficzny APR wykorzystujący bibliotekę Mozilla NSS +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description crypto-nss +APR cryptographic module using Mozilla NSS library. + +%description crypto-nss -l pl.UTF-8 +Moduł kryptograficzny APR wykorzystujący bibliotekę Mozilla NSS. + +%package crypto-openssl +Summary: APR cryptographic module using OpenSSL library +Summary(pl.UTF-8): Moduł kryptograficzny APR wykorzystujący bibliotekę OpenSSL +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description crypto-openssl +APR cryptographic module using OpenSSL library. + +%description crypto-openssl -l pl.UTF-8 +Moduł kryptograficzny APR wykorzystujący bibliotekę OpenSSL. + +%package dbd-freetds +Summary: DBD driver for FreeTDS (Sybase/MS SQL) +Summary(pl.UTF-8): Sterownik DBD dla FreeTDS (Sybase/MS SQL) +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description dbd-freetds +DBD driver for FreeTDS (Sybase/MS SQL). + +%description dbd-freetds -l pl.UTF-8 +Sterownik DBD dla FreeTDS (Sybase/MS SQL). + %package dbd-mysql Summary: DBD driver for MySQL Summary(pl.UTF-8): Sterownik DBD dla MySQL-a @@ -63,6 +122,31 @@ DBD driver for MySQL. %description dbd-mysql -l pl.UTF-8 Sterownik DBD dla MySQL-a. +%package dbd-odbc +Summary: DBD driver for ODBC +Summary(pl.UTF-8): Sterownik DBD dla ODBC +License: GPL +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description dbd-odbc +DBD driver for ODBC. + +%description dbd-odbc -l pl.UTF-8 +Sterownik DBD dla ODBC. + +%package dbd-oracle +Summary: DBD driver for Oracle +Summary(pl.UTF-8): Sterownik DBD dla Oracle'a +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description dbd-oracle +DBD driver for Oracle. + +%description dbd-oracle -l pl.UTF-8 +Sterownik DBD dla Oracle'a. + %package dbd-pgsql Summary: DBD driver for PostgreSQL Summary(pl.UTF-8): Sterownik DBD dla PostgreSQL-a @@ -99,16 +183,37 @@ DBD driver for SQLite 3. %description dbd-sqlite3 -l pl.UTF-8 Sterownik DBD dla SQLite 3. +%package dbm-db +Summary: DBM driver for DB +Summary(pl.UTF-8): Sterownik DBM dla DB +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description dbm-db +DBM driver for DB. + +%description dbm-db -l pl.UTF-8 +Sterownik DBM dla DB. + +%package ldap +Summary: APR LDAP driver +Summary(pl.UTF-8): Sterownik APR dla LDAP +Group: Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description ldap +APR LDAP driver. + +%description ldap -l pl.UTF-8 +Sterownik APR dla LDAP. + %package devel Summary: Header files and development documentation for apr-util Summary(pl.UTF-8): Pliki nagłówkowe i dokumentacja programisty do apr-util Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: apr-devel >= 1:1.1.0 -Requires: db-devel +Requires: apr-devel >= 1:1.6.0 Requires: expat-devel -Requires: gdbm-devel -%{?with_ldap:Requires: openldap-devel >= 2.4.6} %description devel Header files and development documentation for apr-util. @@ -131,21 +236,9 @@ Statyczna biblioteka apr-util. %prep %setup -q %patch0 -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) -%{__sed} -i -e 's/^\(.*gen-build\.py\)/#\1/' buildconf -%endif -%if %{with dso} %patch1 -p1 -%patch2 -p1 -%endif -%patch3 -p1 -%patch4 -p1 -rm -rf xml/expat +%patch3 -p1 echo ' @@ -167,24 +260,28 @@ echo ' ' > config.layout %build +PYTHON=%{__python3} \ ./buildconf \ --with-apr=%{_datadir}/apr -%if %{with dso} -%{__sed} -i -e '/OBJECTS_all/s, dbd/apr_dbd_[^ ]*\.lo,,g' build-outputs.mk -%endif %configure \ --enable-layout=PLD \ --with-apr=%{_bindir}/apr-1-config \ + --with-berkeley-db=%{_prefix} \ + --with-crypto \ + --with-dbm=%{dbver} \ + --with-iconv=%{_prefix} \ %if %{with ldap} --with-ldap \ --with-ldap-include=%{_prefix}/include \ --with-ldap-lib=%{_libdir} \ %endif - --with-iconv=%{_prefix} \ - --with-berkeley-db=%{_prefix} \ - --with-dbm=db46 \ + %{?with_nss:--with-nss} \ + %{?with_openssl:--with-openssl} \ + %{!?with_freetds:--without-freetds} \ %{?with_mysql:--with-mysql=%{_prefix}} \ + %{!?with_odbc:--without-odbc} \ + %{?with_oracle:--with-oracle} \ %{!?with_pgsql:--without-pgsql} \ %{!?with_sqlite2:--without-sqlite2} \ %{!?with_sqlite3:--without-sqlite3} @@ -192,51 +289,15 @@ echo ' %{__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 +%{?with_tests:%{__make} -j1 check} %install rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT - -%if %{with dso} -install -d $RPM_BUILD_ROOT%{_libdir} -%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 + +%{__rm} $RPM_BUILD_ROOT%{_libdir}/apr-util-1/*.{la,a} %clean rm -rf $RPM_BUILD_ROOT @@ -246,45 +307,95 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc CHANGES -%attr(755,root,root) %{_libdir}/lib*.so.*.* +%doc CHANGES NOTICE README +%attr(755,root,root) %{_libdir}/libaprutil-1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libaprutil-1.so.0 +%dir %{_libdir}/apr-util-1 + +%if %{with nss} +%files crypto-nss +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_nss-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_nss.so +%endif + +%if %{with openssl} +%files crypto-openssl +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_openssl-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_crypto_openssl.so +%endif + +%if %{with freetds} +%files dbd-freetds +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_freetds-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_freetds.so +%endif -%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 +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_mysql-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_mysql.so +%endif + +%if %{with odbc} +%files dbd-odbc +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_odbc-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_odbc.so +%endif + +%if %{with oracle} +%files dbd-oracle +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_oracle-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_oracle.so %endif %if %{with pgsql} %files dbd-pgsql %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/apr_dbd_pgsql.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_pgsql-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/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 +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_sqlite2-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/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 +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_sqlite3-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbd_sqlite3.so %endif + +%files dbm-db +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbm_db-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_dbm_db.so + +%if %{with ldap} +%files ldap +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/apr-util-1/apr_ldap-1.so +%attr(755,root,root) %{_libdir}/apr-util-1/apr_ldap.so %endif %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/libaprutil*.so -%{_libdir}/lib*.la +%attr(755,root,root) %{_bindir}/apu-1-config +%attr(755,root,root) %{_libdir}/libaprutil-1.so +%{_libdir}/libaprutil-1.la %{_libdir}/aprutil.exp %{_includedir} %{_pkgconfigdir}/apr-util-1.pc %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libaprutil-1.a