gunnar: server/kolab-webclient ChangeLog, 1.17, 1.18 kolab-webclient.spec, 1.35, 1.36

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv29249/kolab-webclient

Modified Files:
	ChangeLog kolab-webclient.spec 
Log Message:
kolab/issue1623 ([horde/horde-kronolith] Add support for Date_Holidays)
kolab/issue3509 (calender not displaying in horde if german holidays are selected)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ChangeLog	11 May 2009 19:12:03 -0000	1.17
+++ ChangeLog	11 Jul 2009 15:12:22 -0000	1.18
@@ -1,3 +1,10 @@
+2009-07-11  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: 
+
+	kolab/issue1623 ([horde/horde-kronolith] Add support for Date_Holidays)
+	kolab/issue3509 (calender not displaying in horde if german holidays are selected)
+
 2009-05-11  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: 

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- kolab-webclient.spec	10 Jul 2009 04:18:18 -0000	1.35
+++ kolab-webclient.spec	11 Jul 2009 15:12:22 -0000	1.36
@@ -88,8 +88,31 @@
 PreReq:       Kolab_Format >= 1.0.1
 PreReq:       Kolab_Server >= 0.5.0
 PreReq:       Kolab_Storage >= 0.4.0
+
+# Needed by imp
 PreReq:       PEAR-Auth_SASL >= 1.0.2
 
+# Needed by kronolith
+PreReq:       PEAR-Date_Holidays_Austria >= 0.1.3
+PreReq:       PEAR-Date_Holidays_Brazil >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Denmark >= 0.1.3
+PreReq:       PEAR-Date_Holidays_Discordian >= 0.1.1
+PreReq:       PEAR-Date_Holidays_EnglandWales >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Germany >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Iceland >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Ireland >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Italy >= 0.1.1
+PreReq:       PEAR-Date_Holidays_Japan >= 0.1.1
+PreReq:       PEAR-Date_Holidays_Netherlands >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Norway >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Romania >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Slovenia >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Sweden >= 0.1.2
+PreReq:       PEAR-Date_Holidays_Ukraine >= 0.1.2
+PreReq:       PEAR-Date_Holidays_UNO >= 0.1.3
+PreReq:       PEAR-Date_Holidays_USA >= 0.1.1
+
+
 Obsoletes:    horde-kolab, horde-kronolith-kolab, horde-imp-kolab, horde-ingo-kolab, horde-kolab-client, horde-dimp-kolab, horde-mimp-kolab, horde-mnemo-kolab, horde-nag-kolab, horde-passwd-kolab, horde-turba-kolab, PEAR-Net_Sieve
 
 AutoReq:      no
@@ -192,6 +215,11 @@
 	# Use PEAR-Auth_SASL-1.0.2 from /kolab/lib/php
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Auth*
 
+	# Use PEAR-Date* from /kolab/lib/php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Date*
+
+	# Use PEAR-XML_* from /kolab/lib/php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/XML*
 
         sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/storage/horde.db < scripts/sql/groupware.sql