martin: server/imapd Makefile,1.11,1.12 kolab.patch,1.8,1.9

[cvs at intevation.de]

Author: martin

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

Modified Files:
	Makefile kolab.patch 
Log Message:
Martin K.: I just noticed that the kolab.pathc file is indeed a patch for impad.spec. So I will maintain this patch instead of a 
kolab specific impad.spec


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	13 Jul 2004 20:40:06 -0000	1.11
+++ Makefile	13 Jul 2004 21:14:19 -0000	1.12
@@ -16,6 +16,8 @@
 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/
+        
 	cd $(KOLABRPMSRC)/imapd && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba imapd.spec --define 'with_group yes' --define 'with_vhost_hack yes' --define 'with_annotate yes'
 
 imapd-$(VERSION)-$(RELEASE).src.rpm:

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kolab.patch	5 Jul 2004 15:05:04 -0000	1.8
+++ kolab.patch	13 Jul 2004 21:14:19 -0000	1.9
@@ -1,6 +1,15 @@
---- imapd.spec.orig	2004-07-05 12:00:41.000000000 +0200
-+++ imapd.spec	2004-07-05 12:04:14.000000000 +0200
-@@ -34,13 +34,14 @@ Class:        BASE
+--- /kolab/RPM/SRC/imapd/imapd.spec	2004-07-05 09:30:52.000000000 +0200
++++ ./imapd.spec	2004-07-13 22:58:15.527718317 +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>
+ ##  Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
++##  Copyright (c) 2004 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
++##  Copyright (c) 2004 Martin Konold <martin.konold at erfrakon.de>
+ ##
+ ##  Permission to use, copy, modify, and distribute this software for
+ ##  any purpose with or without fee is hereby granted, provided that
+@@ -34,13 +36,15 @@
  Group:        Mail
  License:      BSD
  Version:      2.2.6
@@ -8,29 +17,49 @@
 +Release:      20040701_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_fsl      yes
++%option       with_group    no
++%option       with_atvdom   no
++%option       with_drac     no
 +%option       with_annotate no
++%option       with_ldap     no
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +51,7 @@ Source3:      imapd.conf
+@@ -50,6 +54,8 @@
  Source4:      fsl.imapd
  Patch0:       imapd.patch
  Patch1:       imapd.patch.group
 +Patch2:       imapd.annotate.patch
++Patch3:	      kolab-ldap.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -95,6 +97,9 @@ AutoReqProv:  no
+@@ -62,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
+ 
+@@ -95,6 +105,12 @@
      sleep 1
      touch configure
  %endif
 +%if "%{with_annotate}" == "yes"
 +    %patch -p0 -P 2
 +%endif
++
++    %patch -p0 -P 3
++
      %{l_shtool} subst \
          -e 's;-L/usr/local/lib;;g' \
          -e 's;-I/usr/local/include;;g' \