OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 11-Mar-2003 11:38:14
Branch: HEAD Handle: 2003031110381102
Modified files:
openpkg-src/imapd imapd.spec
openpkg-web news.txt
Log:
use libtool hammer to nail dependent libraries pulled in by sasl
Summary:
Revision Changes Path
1.54 +13 -2 openpkg-src/imapd/imapd.spec
1.3645 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 imapd.spec
--- openpkg-src/imapd/imapd.spec 28 Feb 2003 17:07:55 -0000 1.53
+++ openpkg-src/imapd/imapd.spec 11 Mar 2003 10:38:13 -0000 1.54
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 2.1.12
-Release: 20030228
+Release: 20030311
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
@@ -45,7 +45,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make,
perl, perl-openpkg
+BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, db >= 4.1.24, openssl, make,
perl, perl-openpkg, libtool
PreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, perl, MTA
AutoReq: no
AutoReqProv: no
@@ -97,6 +97,16 @@
-e "s;^\(\$sievedir =
\"\).*$;\1$RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve\"\;;" \
tools/mkimap
+ # avoid sasl2 test in case of dependent libraries from sasl package
+ ( echo 'ac_cv_lib_sasl2_prop_get=yes'
+ echo 'ac_cv_lib_sasl2_sasl_checkapop=yes'
+ ) >cache.config
+
+ # use libtool to catch dependencies
+ %{l_shtool} subst \
+ -e 's;\$(CC) \(\$(LDFLAGS)\);%{l_libtool} --mode=link \$(CC);g' \
+ */Makefile.in
+
%build
cflags="-I%{l_prefix}/include"
ldflags="-L%{l_prefix}/lib"
@@ -108,6 +118,7 @@
CFLAGS="%{l_cflags -O} $cflags" \
LDFLAGS="$ldflags" \
./configure \
+ --cache-file=./cache.config \
--prefix=%{l_prefix} \
--with-openssl=%{l_prefix} \
--with-dbdir=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3644 -r1.3645 news.txt
--- openpkg-web/news.txt 10 Mar 2003 19:48:50 -0000 1.3644
+++ openpkg-web/news.txt 11 Mar 2003 10:38:11 -0000 1.3645
@@ -1,3 +1,4 @@
+11-Mar-2003: Upgraded package: P<imapd-2.1.12-20030311>
10-Mar-2003: Upgraded package: P<gcc33-3.3s20030310-20030310>
10-Mar-2003: Upgraded package: P<xterm-1.75-20030310>
10-Mar-2003: Upgraded package: P<vim-6.1.386-20030310>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
