OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar Wro$ Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 06-Dec-2007 07:47:40 Branch: HEAD Handle: 2007120606473900 Modified files: openpkg-src/imapd imapd.spec Log: Reverted 1.182 -> 1.183 because imapd suddenly links to the bdb lib outside of the OpenPKG environment. Summary: Revision Changes Path 1.186 +11 -1 openpkg-src/imapd/imapd.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/imapd/imapd.spec ============================================================================ $ cvs diff -u -r1.185 -r1.186 imapd.spec --- openpkg-src/imapd/imapd.spec 30 Nov 2007 10:50:15 -0000 1.185 +++ openpkg-src/imapd/imapd.spec 6 Dec 2007 06:47:39 -0000 1.186 @@ -33,7 +33,7 @@ Group: Mail License: BSD Version: 2.3.10 -Release: 20071130 +Release: 20071206 # package options %option with_fsl yes @@ -162,6 +162,14 @@ # make sure config2header rebuilds imapopts based on imapoptions rm -f lib/imapopts.h lib/imapopts.c >/dev/null 2>&1 || true + # fix Berkeley-DB detection + %{l_shtool} subst\ + -e 's;-L/usr/local/lib;;g' \ + -e 's;-I/usr/local/include;;g' \ + -e 's;db-4\.[0-9];db;g' \ + -e 's;-l\$dbname;%{l_prefix}/lib/lib$dbname.a;g' \ + configure + # ensure correct linking of Berkeley-DB in perl bindings loclibs="" case "%{l_platform -t}" in @@ -249,6 +257,8 @@ --with-lib-subdir=%{l_prefix}/lib \ --with-openssl=%{l_prefix} \ --with-bdb=%{l_prefix} \ + --with-bdb-incdir=%{l_prefix}/include \ + --with-bdb-libdir=%{l_prefix}/lib \ --with-sasl=%{l_prefix} \ --with-staticsasl=%{l_prefix} \ --with-com_err \ @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org