gunnar: server/kolabd/kolabd ChangeLog, 1.234.2.17, 1.234.2.18 kolabd.spec.in, 1.44.2.2, 1.44.2.3

cvs at kolab.org cvs at kolab.org
Wed Apr 21 18:10:59 CEST 2010


Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolabd.spec.in 
Log Message:
Remove hash and tokenizer as the php and apache-php specs do not yet support these flags. Leave that change to HEAD.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.234.2.17
retrieving revision 1.234.2.18
diff -u -d -r1.234.2.17 -r1.234.2.18
--- ChangeLog	21 Apr 2010 14:55:51 -0000	1.234.2.17
+++ ChangeLog	21 Apr 2010 16:10:57 -0000	1.234.2.18
@@ -1,7 +1,6 @@
 2010-04-21  Gunnar Wrobel <wrobel at pardus.de>
 
-	* kolabd.spec.in: Require the hash, json, and tokenizer modules in
-	php and apache-php.
+	* kolabd.spec.in: Require the json module in php and apache-php.
 
 2010-02-27  Gunnar Wrobel <wrobel at pardus.de>
 

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.44.2.2
retrieving revision 1.44.2.3
diff -u -d -r1.44.2.2 -r1.44.2.3
--- kolabd.spec.in	21 Apr 2010 14:55:51 -0000	1.44.2.2
+++ kolabd.spec.in	21 Apr 2010 16:10:57 -0000	1.44.2.3
@@ -57,8 +57,8 @@
 PreReq:       Kolab_FreeBusy
 
 # what about php::with_tidy = yes (for Horde Imp)
-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, php::with_hash = yes, php::with_json = yes, php::with_tokenizer = 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, apache-php::with_spl = yes, apache-php::with_hash = yes, apache-php::with_json = yes, apache-php::with_tokenizer = 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, php::with_json = 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, apache-php::with_spl = yes, apache-php::with_json = yes
 
 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





More information about the commits mailing list