apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r798340 - in /apr/apr/trunk: CHANGES build/rpm/apr.spec.in
Date Tue, 28 Jul 2009 00:07:05 GMT
Author: minfrin
Date: Tue Jul 28 00:07:05 2009
New Revision: 798340

URL: http://svn.apache.org/viewvc?rev=798340&view=rev
Log:
Make sure the LD_LIBRARY_PATH is sensible when running the tests
from the RPM build, so that the crypto, dbd and dbm tests pass.
Transfer the apr-util spec file contents to apr.spec.

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/build/rpm/apr.spec.in

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=798340&r1=798339&r2=798340&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Tue Jul 28 00:07:05 2009
@@ -1,6 +1,11 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 2.0.0
 
+  *) Make sure the LD_LIBRARY_PATH is sensible when running the tests
+     from the RPM build, so that the crypto, dbd and dbm tests pass.
+     Transfer the apr-util spec file contents to apr.spec. [Graham
+     Leggett]
+
   *) Clarify the error messages within the dbd tests. [Graham Leggett]
 
   *) More elaborate detection for dup3(), accept4() and epoll_create1().

Modified: apr/apr/trunk/build/rpm/apr.spec.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/rpm/apr.spec.in?rev=798340&r1=798339&r2=798340&view=diff
==============================================================================
--- apr/apr/trunk/build/rpm/apr.spec.in (original)
+++ apr/apr/trunk/build/rpm/apr.spec.in Tue Jul 28 00:07:05 2009
@@ -29,6 +29,92 @@
 Apache Portable Runtime (APR) is to provide a free library of 
 C data structures and routines.
 
+%package dbm
+Group: Development/Libraries 
+Summary: APR utility library DBM driver
+BuildRequires: db4-devel
+Requires: apr-util = %{version}-%{release}
+
+%description dbm
+This package provides the DBM driver for the apr-util.
+
+%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.
+
+%package sqlite
+Group: Development/Libraries
+Summary: APR utility library SQLite DBD driver
+BuildRequires: sqlite-devel >= 3.0.0
+Requires: apr-util = %{version}-%{release}
+
+%description sqlite
+This package provides the SQLite driver for the apr-util DBD
+(database abstraction) interface.
+
+%package freetds
+Group: Development/Libraries
+Summary: APR utility library FreeTDS DBD driver
+BuildRequires: freetds-devel
+Requires: apr-util = %{version}-%{release}
+
+%description freetds
+This package provides the FreeTDS driver for the apr-util DBD
+(database abstraction) interface.
+
+%package odbc
+Group: Development/Libraries
+Summary: APR utility library ODBC DBD driver
+BuildRequires: unixODBC-devel
+Requires: apr-util = %{version}-%{release}
+
+%description odbc
+This package provides the ODBC driver for the apr-util DBD
+(database abstraction) interface.
+
+%package ldap
+Group: Development/Libraries
+Summary: APR utility library LDAP support
+BuildRequires: openldap-devel
+Requires: apr-util = %{version}-%{release}
+
+%description ldap
+This package provides the LDAP support for the apr-util.
+
+%package openssl
+Group: Development/Libraries
+Summary: APR utility library OpenSSL crypto support
+BuildRequires: openssl-devel
+Requires: apr-util = %{version}-%{release}
+
+%description openssl
+This package provides crypto support for apr-util based on OpenSSL.
+
+%package nss
+Group: Development/Libraries
+Summary: APR utility library NSS crypto support
+BuildRequires: nss-devel
+Requires: apr-util = %{version}-%{release}
+
+%description nss
+This package provides crypto support for apr-util based on Mozilla NSS.
+
 %prep
 %setup -q
 
@@ -40,6 +126,11 @@
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr/build-%{aprver} \
         --with-devrandom=/dev/urandom \
+        --with-ldap --without-gdbm \
+        --with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \
+        --with-berkeley-db \
+        --with-crypto --with-openssl --with-nss \
+        --without-sqlite2
         CC=gcc CXX=g++
 make %{?_smp_mflags} && make dox
 
@@ -47,7 +138,7 @@
 # Run non-interactive tests
 pushd test
 make %{?_smp_mflags} all CFLAGS=-fno-strict-aliasing
-./testall -v || exit 1
+LD_LIBRARY_PATH=../crypto/.libs:../dbd/.libs:../dbm/.libs ./testall -v || exit 1
 popd
 
 %install
@@ -71,6 +162,43 @@
 %defattr(-,root,root,-)
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libapr-%{aprver}.so.*
+%dir %{_libdir}/apr-%{aprver}
+
+%files dbm
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_dbm_db*
+
+%files pgsql
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_dbd_pgsql*
+
+%files mysql
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_dbd_mysql*
+
+%files sqlite
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_dbd_sqlite*
+
+%files freetds
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_dbd_freetds*
+
+%files odbc
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_dbd_odbc*
+
+%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_ldap*
+
+%files openssl
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_crypto_openssl*
+
+%files nss
+%defattr(-,root,root,-)
+%{_libdir}/apr-%{aprver}/apr_crypto_nss*
 
 %files devel
 %defattr(-,root,root,-)



Mime
View raw message