gunnar: server/kolabd/kolabd ChangeLog, 1.108, 1.109 kolabd.spec.in, 1.14, 1.15

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23637/kolabd/kolabd

Modified Files:
	ChangeLog kolabd.spec.in 
Log Message:
Added with_horde support to kolabd. And a fix in kolabconf: kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- ChangeLog	2 Aug 2007 10:34:38 -0000	1.108
+++ ChangeLog	7 Aug 2007 11:40:15 -0000	1.109
@@ -1,3 +1,9 @@
+2007-08-05  Gunnar Wrobel  <p at rdus.de>
+
+	* kolabd.spec.in:
+
+	Added "with_horde" support.
+
 2007-08-02  Gunnar Wrobel  <p at rdus.de>
 
 	* kolabd.spec.in:

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolabd.spec.in	5 Aug 2007 05:42:21 -0000	1.14
+++ kolabd.spec.in	7 Aug 2007 11:40:15 -0000	1.15
@@ -100,6 +100,9 @@
 
 %prep
     %setup -q
+%if "%{with_horde}" == "yes"
+    sed -i -e 's/^#\(.*horde.*\)/\1/' templates/slapd.conf.template
+%endif
 
 %build
     ./configure --prefix=%{l_prefix} --with-dist=kolab