steffen: server/imap Makefile,1.1,1.2 kolab.patch,1.1,1.2

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/imap
In directory doto:/tmp/cvs-serv23783/imap

Modified Files:
	Makefile kolab.patch 
Log Message:
integrated patches from Martin. Had to upgrade to imap-2004c-2.3.0 because patch was rejected by 2004a-2.2.0

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imap/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	11 Jun 2005 16:52:41 -0000	1.1
+++ Makefile	16 Jun 2005 03:04:13 -0000	1.2
@@ -9,8 +9,8 @@
 endif
 
 PACKAGE=imap
-VERSION=2004a
-RELEASE=2.2.0_kolab1
+VERSION=2004c
+RELEASE=2.3.0
 
 RPM=/kolab/bin/openpkg rpm
  

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imap/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch	11 Jun 2005 16:52:41 -0000	1.1
+++ kolab.patch	16 Jun 2005 03:04:13 -0000	1.2
@@ -4,8 +4,8 @@
  Group:        Mail
  License:      University of Washington's Free-Fork License
  Version:      %{V_here}
--Release:      2.2.0
-+Release:      2.2.0_kolab1
+-Release:      2.3.0
++Release:      2.3.0_kolab
  
  #   package options
  %option       with_ssl      yes
@@ -16,7 +16,7 @@
  
  #   list of sources
  Source0:      ftp://ftp.cac.washington.edu/imap/imap-%{V_real}.tar.Z
-+Patch0:       imapd.patch
++Patch0:       imap.annotate.patch
  
  #   build information
  Prefix:       %{l_prefix}
@@ -25,7 +25,7 @@
      %setup -q -n imap-%{V_real}
  
 +%if "%{with_annotate}" == "yes"
-+    %patch -p0 -P 0
++    %patch -p1 -P 0
 +%endif
 +
  %build