OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Oct-2007 17:43:29
Branch: HEAD Handle: 2007103116432900
Modified files:
openpkg-src/openldap openldap.spec
Log:
switch back to using DB 4.6 as this version is officially supported by
OpenLDAP 2.4
Summary:
Revision Changes Path
1.205 +5 -5 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.204 -r1.205 openldap.spec
--- openpkg-src/openldap/openldap.spec 31 Oct 2007 16:34:54 -0000
1.204
+++ openpkg-src/openldap/openldap.spec 31 Oct 2007 16:43:29 -0000
1.205
@@ -57,8 +57,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: readline, openssl, db45
-PreReq: readline, openssl, db45
+BuildPreReq: readline, openssl, db >= 4.5
+PreReq: readline, openssl, db >= 4.5
%if "%{with_server}" == "yes" && "%{with_fsl}" == "yes"
BuildPreReq: fsl
PreReq: fsl
@@ -105,8 +105,8 @@
# configuration: standard build flags
export CC="%{l_cc}"
export CFLAGS="%{l_cflags -O}"
- export CPPFLAGS="%{l_cppflags db45 .}"
- export LDFLAGS="%{l_ldflags db45 .}"
+ export CPPFLAGS="%{l_cppflags}"
+ export LDFLAGS="%{l_ldflags}"
export LIBS=""
export ARGS=""
ARGS="$ARGS --prefix=%{l_prefix}"
@@ -195,7 +195,7 @@
# configuration: use hard-links and make sure our Berkeley-DB is
picked up first
%{l_shtool} subst \
-e 's;ln -s;ln;g' \
- -e 's;-ldb4[1-9];%{l_prefix}/lib/db45/libdb.a;g' \
+ -e 's;-ldb4[1-9];%{l_prefix}/lib/libdb.a;g' \
-e 's;<db\.h>;"db.h";g' \
configure
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
