steffen: server/imapd Makefile,1.23,1.24 kolab.patch,1.23,1.24
cvs at intevation.de
cvs at intevation.de
Sat Jul 23 00:36:16 CEST 2005
Author: steffen
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv30112/imapd
Modified Files:
Makefile kolab.patch
Log Message:
Upgrade to openpkg-2.4
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile 28 Jun 2005 12:51:38 -0000 1.23
+++ Makefile 22 Jul 2005 22:36:14 -0000 1.24
@@ -1,5 +1,5 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = ftp://ftp.openpkg.org/release/2.3/SRC
+ KOLABPKGURI = ftp://ftp.openpkg.org/release/2.4/SRC
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = /kolab/RPM/SRC
@@ -10,15 +10,15 @@
PACKAGE=imapd
VERSION=2.2.12
-RELEASE=2.3.0
+RELEASE=2.4.0
RPM=/kolab/bin/openpkg rpm
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
- cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
cp $(KOLABCVSDIR)/cyradm.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
+ cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/$(PACKAGE)/
cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for imapd.spec
cp $(KOLABCVSDIR)/imapd.group2.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for case insensitive group match
cp $(KOLABCVSDIR)/imapd-goodchars.patch $(KOLABRPMSRC)/$(PACKAGE)/ # Patch for allowing special chars in mailbox names
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kolab.patch 28 Jun 2005 12:51:38 -0000 1.23
+++ kolab.patch 22 Jul 2005 22:36:14 -0000 1.24
@@ -1,9 +1,9 @@
--- ../imapd.orig/imapd.spec 2005-02-21 18:02:27.000000000 +0100
-+++ imapd.spec 2005-06-28 14:11:31.000000000 +0200
++++ imapd.spec 2005-06-10 04:00:13.000000000 +0200
@@ -3,6 +3,9 @@
- ## Copyright (c) 2000-2005 The OpenPKG Project <http://www.openpkg.org/>
- ## Copyright (c) 2000-2005 Ralf S. Engelschall <rse at engelschall.com>
- ## Copyright (c) 2000-2005 Cable & Wireless <http://www.cw.com/>
+ ## imapd.spec -- OpenPKG RPM Package Specification
+ ## Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
+ ## Copyright (c) 2000-2005 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+## Copyright (c) 2004 Martin Konold <martin.konold at erfrakon.de>
+## Copyright (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
@@ -14,8 +14,8 @@
Group: Mail
License: BSD
Version: 2.2.12
--Release: 2.3.0
-+Release: 2.3.0_kolab5
+-Release: 2.4.0
++Release: 2.4.0_kolab
# package options
-%option with_fsl yes
@@ -37,14 +37,14 @@
Patch0: imapd.patch
Patch1: imapd.patch.group
+Patch2: imapd.annotate.patch
-+Patch3: kolab-ldap.patch
-+Patch4: imapd.group2.patch
++Patch3: kolab-ldap.patch
++Patch4: imapd.group2.patch
+Patch5: imapd-goodchars.patch
+Patch6: cyradm.annotate.patch
# build information
Prefix: %{l_prefix}
-@@ -62,6 +73,10 @@ PreReq: sasl, db >= 4.2.52, openss
+@@ -62,6 +72,10 @@ PreReq: sasl, db >= 4.2.52, openss
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
@@ -55,7 +55,7 @@
AutoReq: no
AutoReqProv: no
-@@ -88,6 +103,7 @@ AutoReqProv: no
+@@ -88,6 +102,7 @@ AutoReqProv: no
%{l_shtool} subst \
-e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
lib/auth_unix.c
@@ -63,13 +63,12 @@
%endif
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -95,10 +111,22 @@ AutoReqProv: no
+@@ -95,10 +110,21 @@ AutoReqProv: no
sleep 1
touch configure
%endif
+%if "%{with_annotate}" == "yes"
+ %patch -p0 -P 2
-+ %patch -p0 -P 6
+%endif
+%if "%{with_ldap}" == "yes"
+ %patch -p0 -P 3
@@ -77,7 +76,7 @@
+%if "%{with_goodchars}" == "yes"
+ %patch -p1 -P 5
+%endif
-+
++ %patch -p0 -P 6
%{l_shtool} subst \
-e 's;-L/usr/local/lib;;g' \
-e 's;-I/usr/local/include;;g' \
@@ -87,18 +86,3 @@
configure
# ensure local com_err can be used
-@@ -112,12 +140,12 @@ AutoReqProv: no
- *-sunos* )
- %{l_shtool} subst \
- -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb -lrt\2;' \
-- perl/imap/Makefile.PL
-+ perl/imap/Makefile.PL perl/sieve/managesieve/Makefile.PL
- ;;
- * )
- %{l_shtool} subst \
- -e 's;^\( *.LIBS..*\)\(\"\],.*\)$;\1 -ldb\2;' \
-- perl/imap/Makefile.PL
-+ perl/imap/Makefile.PL perl/sieve/managesieve/Makefile.PL
- ;;
- esac
-
More information about the commits
mailing list