steffen: server/imapd Makefile, 1.22.2.1, 1.22.2.2 kolab.patch, 1.22.2.1, 1.22.2.2

[cvs at intevation.de]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab.patch 
Log Message:
cyradm mbxcfg /annotation blah

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- Makefile	19 Jul 2005 21:00:59 -0000	1.22.2.1
+++ Makefile	29 Aug 2005 07:14:06 -0000	1.22.2.2
@@ -17,6 +17,7 @@
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
+	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

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- kolab.patch	19 Jul 2005 21:00:59 -0000	1.22.2.1
+++ kolab.patch	29 Aug 2005 07:14:06 -0000	1.22.2.2
@@ -32,14 +32,15 @@
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +56,10 @@ Source3:      imapd.conf
+@@ -50,6 +56,11 @@ Source3:      imapd.conf
  Source4:      fsl.imapd
  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}
@@ -75,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' \