thomas: server/kolabd/kolabd/templates slapd.conf.template.in, 1.24, 1.25

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	slapd.conf.template.in 
Log Message:
* kolabd.spec.in, templates/slapd.conf.template.in: Removed "with_horde" option:

Always disable the horde schema (since prefs are stored in files now), but
compile php/apache-php with all dependencies needed by horde. This will fix
kolab/issue2440 (Installing binary packages of 2.2-beta3 fails without -H),
too.


Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- slapd.conf.template.in	10 Sep 2008 20:48:20 -0000	1.24
+++ slapd.conf.template.in	11 Dec 2008 16:56:52 -0000	1.25
@@ -21,7 +21,7 @@
 include @ldapserver_schemadir@/inetorgperson.schema
 include @ldapserver_schemadir@/rfc2739.schema
 include @ldapserver_schemadir@/kolab2.schema
-include @ldapserver_schemadir@/horde.schema
+#include @ldapserver_schemadir@/horde.schema
 
 pidfile		@ldapserver_pidfile@
 argsfile	@ldapserver_argsfile@