thomas: server/imapd kolab.patch,1.32,1.33
cvs at kolab.org
cvs at kolab.org
Tue Mar 11 16:47:15 CET 2008
- Previous message: thomas: server/imapd .cvsignore, 1.2, 1.3 Makefile, 1.31, 1.32 README, 1.4, 1.5 kolab.patch, 1.31, 1.32 timsieved-starttls-sendcaps.patch, NONE, 1.1
- Next message: thomas: server/imapd imapd.patch.group, NONE, 1.1 Makefile, 1.32, 1.33 kolab.patch, 1.33, 1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thomas
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv7733
Modified Files:
kolab.patch
Log Message:
Fixed wrong patch direction
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kolab.patch 11 Mar 2008 15:42:19 -0000 1.32
+++ kolab.patch 11 Mar 2008 15:47:13 -0000 1.33
@@ -1,39 +1,39 @@
---- imapd.spec.orig 2008-02-02 11:40:34.000000000 +0100
-+++ imapd.spec 2008-01-01 15:31:56.000000000 +0100
+--- imapd.spec.orig 2008-01-01 15:31:56.000000000 +0100
++++ imapd.spec 2008-03-11 16:45:35.584783000 +0100
@@ -32,7 +32,7 @@
Group: Mail
License: BSD
Version: 2.3.11
--Release: 20080101_kolab
-+Release: 20080101
+-Release: 20080101
++Release: 20080101_kolab
# package options
%option with_fsl yes
-@@ -48,7 +48,6 @@
+@@ -48,6 +48,7 @@
%option with_annotate no
%option with_morelogging no
%option with_kolab no
--%option with_kolab_nocaps no
++%option with_kolab_nocaps no
# fixing implicit inter-module dependencies and correlations
%if "%{with_kolab}" == "yes"
-@@ -74,7 +73,6 @@
+@@ -73,6 +74,7 @@
Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Logging.patch
Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch
Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch
--Patch7: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/imapd/timsieved-starttls-sendcaps.patch
++Patch7: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/imapd/timsieved-starttls-sendcaps.patch
# build information
Prefix: %{l_prefix}
-@@ -154,11 +152,6 @@
+@@ -152,6 +154,11 @@
%patch -p1 -P 6
%endif
-- # kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls)
--%if "%{with_kolab_nocaps}" == "yes"
-- %patch -p2 -R -P 7
--%endif
--
++ # kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls)
++%if "%{with_kolab_nocaps}" == "yes"
++ %patch -p2 -R -P 7
++%endif
++
# add optional DRAC file support
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
- Previous message: thomas: server/imapd .cvsignore, 1.2, 1.3 Makefile, 1.31, 1.32 README, 1.4, 1.5 kolab.patch, 1.31, 1.32 timsieved-starttls-sendcaps.patch, NONE, 1.1
- Next message: thomas: server/imapd imapd.patch.group, NONE, 1.1 Makefile, 1.32, 1.33 kolab.patch, 1.33, 1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list