[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apr-cvs
Subject:    svn commit: r798326 - in /apr/apr-util/branches/1.3.x: CHANGES
From:       minfrin () apache ! org
Date:       2009-07-27 23:16:21
Message-ID: 20090727231621.DE284238887A () eris ! apache ! org
[Download RAW message or body]

Author: minfrin
Date: Mon Jul 27 23:16:21 2009
New Revision: 798326

URL: http://svn.apache.org/viewvc?rev=798326&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.
Ensure the dbm module is packaged up correctly in the RPM.

Modified:
    apr/apr-util/branches/1.3.x/CHANGES
    apr/apr-util/branches/1.3.x/build/rpm/apr-util.spec.in

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=798326&r1=798325&r2=798326&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Mon Jul 27 23:16:21 2009
@@ -1,6 +1,11 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.3.9
 
+  *) 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.
+     Ensure the dbm module is packaged up correctly in the RPM.
+     [Graham Leggett]
+
   *) Clarify the error messages within the dbd tests. [Graham Leggett]
 
 Changes with APR-util 1.3.8

Modified: apr/apr-util/branches/1.3.x/build/rpm/apr-util.spec.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/rpm/apr-util.spec.in?rev=798326&r1=798325&r2=798326&view=diff
 ==============================================================================
--- apr/apr-util/branches/1.3.x/build/rpm/apr-util.spec.in (original)
+++ apr/apr-util/branches/1.3.x/build/rpm/apr-util.spec.in Mon Jul 27 23:16:21 2009
@@ -11,7 +11,7 @@
 Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 1.3.0
-BuildPrereq: db4-devel, expat-devel
+BuildPrereq: expat-devel
 
 %description
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -90,6 +90,15 @@
 %description ldap
 This package provides the LDAP support for the apr-util.
 
+%package dbm
+Group: Development/Libraries
+Summary: APR utility library DBM support
+BuildRequires: db4-devel
+Requires: apr-util = %{version}-%{release}
+
+%description dbm
+This package provides the dbm support for the apr-util.
+
 %prep
 %setup -q
 
@@ -106,7 +115,7 @@
 # Run non-interactive tests
 pushd test
 make %{?_smp_mflags} all CFLAGS=-fno-strict-aliasing
-./testall -v || exit 1
+LD_LIBRARY_PATH=../dbd/.libs:../dbm/.libs ./testall -v || exit 1
 popd
 
 %install
@@ -156,6 +165,10 @@
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_ldap*
 
+%files dbm
+%defattr(-,root,root,-)
+%{_libdir}/apr-util-%{apuver}/apr_dbm_db*
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/apu-%{apuver}-config


[prev in list] [next in list] [prev in thread] [next in thread]