thomas: server/imapd kolab.patch,1.28,1.29 imapd.spec,1.19,NONE

cvs at kolab.org cvs at kolab.org
Wed Jul 19 15:51:06 CEST 2006


Author: thomas

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

Modified Files:
	kolab.patch 
Removed Files:
	imapd.spec 
Log Message:
Removed obsolete imapd.spec and updated kolab.patch to use folderchar patch


Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- kolab.patch	9 Dec 2005 15:55:22 -0000	1.28
+++ kolab.patch	19 Jul 2006 13:51:04 -0000	1.29
@@ -1,5 +1,5 @@
---- imapd.spec.orig	Wed Dec  7 13:05:58 2005
-+++ imapd.spec	Wed Dec  7 15:06:46 2005
+--- imapd.spec.orig	2006-07-19 15:32:33.867230000 +0200
++++ imapd.spec	2006-07-19 15:41:21.484428413 +0200
 @@ -2,6 +2,9 @@
  ##  imapd.spec -- OpenPKG RPM Package Specification
  ##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
@@ -10,7 +10,7 @@
  ##
  ##  Permission to use, copy, modify, and distribute this software for
  ##  any purpose with or without fee is hereby granted, provided that
-@@ -33,13 +36,17 @@ Class:        BASE
+@@ -33,13 +36,17 @@
  Group:        Mail
  License:      BSD
  Version:      2.2.12
@@ -33,20 +33,21 @@
  
  #   list of sources
  Source0:      ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -49,6 +56,12 @@ Source3:      imapd.conf
+@@ -49,6 +56,13 @@
  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
-+Patch7:	      imapd.morelogging.patch
++Patch7:       imapd.morelogging.patch
++Patch8:       imapd.folderchar.patch
  
  #   build information
  Prefix:       %{l_prefix}
-@@ -61,6 +74,10 @@ PreReq:       sasl, db >= 4.2.52, openss
+@@ -61,6 +75,10 @@
  BuildPreReq:  fsl >= 1.2.0
  PreReq:       fsl >= 1.2.0
  %endif
@@ -57,7 +58,7 @@
  AutoReq:      no
  AutoReqProv:  no
  
-@@ -91,6 +108,7 @@ AutoReqProv:  no
+@@ -91,6 +109,7 @@
      %{l_shtool} subst \
          -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
          lib/auth_unix.c
@@ -65,7 +66,7 @@
  %endif
  %if "%{with_drac}" == "yes"
      %{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -98,10 +116,24 @@ AutoReqProv:  no
+@@ -98,10 +117,27 @@
      sleep 1
      touch configure
  %endif
@@ -82,6 +83,9 @@
 +%if "%{with_morelogging}" == "yes"
 +    %patch -p1 -P 7
 +%endif
++%if "%{with_folderchar}" == "yes"
++    %patch -p0 -P 8
++%endif
      %{l_shtool} subst \
          -e 's;-L/usr/local/lib;;g' \
          -e 's;-I/usr/local/include;;g' \
@@ -91,15 +95,15 @@
          configure
  
      #   ensure local et/com_err can be found
-@@ -161,6 +193,11 @@ AutoReqProv:  no
-     %{l_shtool} subst \
+@@ -162,6 +198,11 @@
          -e '/alt_config/s;"deliver";"cyrdeliver";' \
          imap/deliver.c
-+
+ 
 +    %{l_shtool} subst \
 +	-e '/snprintf(buf, sizeof(buf), "%s/s;/reconstruct";/cyrreconstruct";' \
 +	-e '/snprintf(buf, sizeof(buf), "%s/s;/quota";/cyrquota";' \
 +	imap/imapd.c
- 
++
  %build
      cflags="%{l_cppflags}"
+ %if "%{with_atvdom}" == "yes"

--- imapd.spec DELETED ---






More information about the commits mailing list