OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Feb-2004 11:41:05
Branch: HEAD Handle: 2004020910410400
Modified files:
openpkg-src/imapd imapd.spec
Log:
remove obsolete patching and add a new one to hopefully solve the
com_err problems
Summary:
Revision Changes Path
1.110 +6 -5 openpkg-src/imapd/imapd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.109 -r1.110 imapd.spec
--- openpkg-src/imapd/imapd.spec 7 Feb 2004 17:55:37 -0000 1.109
+++ openpkg-src/imapd/imapd.spec 9 Feb 2004 10:41:04 -0000 1.110
@@ -34,7 +34,7 @@
Group: Mail
License: BSD
Version: 2.2.3
-Release: 20040207
+Release: 20040209
# package options
%option with_fsl yes
@@ -93,6 +93,11 @@
-e 's;db-4.1;db;g' \
configure
+ # ensure local com_err can be used
+ %{l_shtool} subst -s \
+ -e 's;#include <com_err.h>;#include "com_err.h";' \
+ `find . -name *.[ch] -print`
+
# ensure linking of Berkeley DB
%{l_shtool} subst \
-e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \
@@ -109,7 +114,6 @@
imap/lmtpd.c \
imap/mbdump.c \
imap/user.c \
- man/imapd.conf.5 \
timsieved/actions.c
# adjust default config to install environment for use in mkimap install
helper script
@@ -160,9 +164,6 @@
%{l_shtool} subst \
-e 's;/etc/\(.*\).conf;%{l_prefix}/etc/imapd/\1.conf;' \
imap/*.c imap/*.h master/*.c master/*.h
- %{l_shtool} subst \
- -e 's;/etc/mail/cyrusmap\.db;%{l_prefix}/var/imapd/cyrusmap.db;' \
- imap/sendmail-map.c
%{l_make} %{l_mflags}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
