thomas: server/kolabd/kolabd ChangeLog, 1.207, 1.208 kolabd.spec.in, 1.40, 1.41

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	ChangeLog kolabd.spec.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: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- ChangeLog	21 Nov 2008 13:12:36 -0000	1.207
+++ ChangeLog	11 Dec 2008 16:56:52 -0000	1.208
@@ -1,3 +1,11 @@
+2008-12-11  /kolab OpenPKG (non-privileged)  <kolab at burlywood1>
+
+	* 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.
+
 2008-11-21  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* kolabd.spec.in: Adjust crontab entry for new location.

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- kolabd.spec.in	25 Nov 2008 22:18:43 -0000	1.40
+++ kolabd.spec.in	11 Dec 2008 16:56:52 -0000	1.41
@@ -45,9 +45,6 @@
 Source0:      kolabd-%{version}.tar.bz2
 #Source1:      rc.kolabd
 
-#   package options
-%option       with_horde              yes
-
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
@@ -64,15 +61,9 @@
 PreReq:       Kolab_Filter
 PreReq:       Kolab_FreeBusy
 
-%if "%{with_horde}" == "yes"
-# FIXME (optional)
 # what about php::with_tidy = yes (for Horde Imp)
-PreReq:       php, php::with_pear = yes, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_spl = yes
+PreReq:       php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_mhash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_spl = yes
 PreReq:       apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_mhash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, php::with_spl = yes
-%else
-PreReq:       php, php::with_zlib = yes, php::with_bdb = yes, php::with_gettext = yes, php::with_imap = yes, php::with_imap_annotate = yes, php::with_openldap = yes, php::with_pear = yes, php::with_xml = yes, php::with_dom = yes, php::with_ssl = yes, php::with_mbstring = yes, php::with_mm = yes, php::with_spl = yes
-PreReq:       apache-php, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_gettext = yes, apache-php::with_imap = yes, apache-php::with_imap_annotate = yes, apache-php::with_openldap = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_dom = yes, apache-php::with_ssl = yes, apache-php::with_mbstring = yes, apache-php::with_mm = yes, php::with_spl = yes
-%endif
 
 PreReq:       imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
 PreReq:       perl-ssl
@@ -101,9 +92,6 @@
 
 %prep
     %setup -q
-%if "%{with_horde}" == "yes"
-    sed -i -e 's/^#\(.*horde.*\)/\1/' templates/slapd.conf.template.in
-%endif
 
 %build
     ./configure --prefix=%{l_prefix} --with-dist=kolab