Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r731295 - in /apr/apr-util/branches/1.4.x: ./ CHANGES
 build/rpm/apr-util.spec.in
Date: Sun, 04 Jan 2009 16:40:43 -0000
To: commits@apr.apache.org
From: minfrin@apache.org
Message-Id: <20090104164043.EE57823888E7@eris.apache.org>

Author: minfrin
Date: Sun Jan  4 08:40:43 2009
New Revision: 731295

URL: http://svn.apache.org/viewvc?rev=731295&view=rev
Log:
Backport r731293 to apr-util-1.4 branch.

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/CHANGES
    apr/apr-util/branches/1.4.x/build/rpm/apr-util.spec.in

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan  4 08:40:43 2009
@@ -1 +1 @@
-/apr/apr-util/trunk:731033-731034,731225,731236,731291
+/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293

Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=731295&r1=731294&r2=731295&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Sun Jan  4 08:40:43 2009
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.4.0
 
+  *) Add optional dbm, openssl and nss subpackages to the RPM spec file.
+     [Graham Leggett]
+
   *) apr_crypto_nss: Oh that it was this easy. Use pgk-config to find
      NSS where possible. [Graham Leggett]
 

Modified: apr/apr-util/branches/1.4.x/build/rpm/apr-util.spec.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/rpm/apr-util.spec.in?rev=731295&r1=731294&r2=731295&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/rpm/apr-util.spec.in (original)
+++ apr/apr-util/branches/1.4.x/build/rpm/apr-util.spec.in Sun Jan  4 08:40:43 2009
@@ -31,6 +31,15 @@
 of the 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
@@ -90,6 +99,24 @@
 %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
 
@@ -99,6 +126,7 @@
         --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
 make %{?_smp_mflags} && make dox
 
@@ -132,6 +160,10 @@
 %{_libdir}/libaprutil-%{apuver}.so.*
 %dir %{_libdir}/apr-util-%{apuver}
 
+%files dbm
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_dbm_db*
+
 %files pgsql
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql*
@@ -156,6 +188,14 @@
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_ldap*
 
+%files openssl
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_crypto_openssl*
+
+%files nss
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_crypto_nss*
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/apu-%{apuver}-config