martin: server/imapd Makefile, 1.12, 1.13 imapd.spec, 1.15, 1.16 kolab.patch, 1.10, 1.11

[cvs at intevation.de]

Author: martin

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv5314

Modified Files:
	Makefile imapd.spec kolab.patch 
Log Message:
Martin K.: New upstream OpenPKG version. Compiles now fine. Maybe best to set virtdomains to useruid
until Tassilo has finalized the LDAP patch.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	13 Jul 2004 21:14:19 -0000	1.12
+++ Makefile	15 Jul 2004 14:37:22 -0000	1.13
@@ -9,14 +9,14 @@
 endif
 
 VERSION=2.2.6
-RELEASE=20040701
+RELEASE=20040706
 
 RPM=/kolab/bin/openpkg rpm
  
 all: imapd-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv imapd-$(VERSION)-$(RELEASE).src.rpm
 	cp $(KOLABCVSDIR)/imapd.annotate.patch $(KOLABRPMSRC)/imapd/
-	cp $(KOLABCVSDIR)/kolab-ldap.patch $(KOLABRPMSRC)/imapd/
+	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/imapd/
         
 	cd $(KOLABRPMSRC)/imapd && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba imapd.spec --define 'with_group yes' --define 'with_vhost_hack yes' --define 'with_annotate yes'
 

Index: imapd.spec
===================================================================
RCS file: /kolabrepository/server/imapd/imapd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- imapd.spec	13 Jul 2004 20:48:22 -0000	1.15
+++ imapd.spec	15 Jul 2004 14:37:22 -0000	1.16
@@ -36,13 +36,13 @@
 Group:        Mail
 License:      BSD
 Version:      2.2.6
-Release:      20040701_kolab
+Release:      20040706_kolab
 
 #   package options
-%option       with_fsl    yes
-%option       with_group  no
-%option       with_atvdom no
-%option       with_drac   no
+%option       with_fsl      yes
+%option       with_group    no
+%option       with_atvdom   no
+%option       with_drac     no
 %option       with_annotate no
 %option       with_ldap     no
 
@@ -68,6 +68,10 @@
 BuildPreReq:  fsl >= 1.2.0
 PreReq:       fsl >= 1.2.0
 %endif
+%if "%{with_ldap}" == "yes"
+BuildPreReq:  openldap >= 2.2.14
+PreReq:       openldap >= 2.2.14
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -104,8 +108,9 @@
 %if "%{with_annotate}" == "yes"
     %patch -p0 -P 2
 %endif
-
+%if "%{with_ldap}" == "yes"
     %patch -p0 -P 3
+%endif
 
     %{l_shtool} subst \
         -e 's;-L/usr/local/lib;;g' \

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab.patch	14 Jul 2004 14:34:55 -0000	1.10
+++ kolab.patch	15 Jul 2004 14:37:22 -0000	1.11
@@ -1,5 +1,5 @@
---- imapd.spec.orig	2004-07-14 16:33:15.658924043 +0200
-+++ imapd.spec	2004-07-14 16:30:53.310937756 +0200
+--- imapd.spec.org	2004-07-15 16:30:49.333617635 +0200
++++ imapd.spec	2004-07-15 16:30:10.962323130 +0200
 @@ -3,6 +3,8 @@
  ##  Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
  ##  Copyright (c) 2000-2004 Ralf S. Engelschall <rse at engelschall.com>
@@ -13,8 +13,8 @@
  Group:        Mail
  License:      BSD
  Version:      2.2.6
--Release:      20040701
-+Release:      20040701_kolab_2004071401
+-Release:      20040706
++Release:      20040706_kolab
  
  #   package options
 -%option       with_fsl    yes