gunnar: server/kolab-webclient ChangeLog, 1.16, 1.17 kolab-webclient.spec, 1.32, 1.33

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog kolab-webclient.spec 
Log Message:
        kolab/issue3293 (Big code duplication and code version messup: Horde
                         libs in 2.2.1)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog	11 May 2009 15:58:14 -0000	1.16
+++ ChangeLog	11 May 2009 19:12:03 -0000	1.17
@@ -2,6 +2,7 @@
 
 	* kolab-webclient.spec: 
 
+	Use Horde_NLS-0.0.2dev20090501 from /kolab/lib/php
 	Use Horde_Util-0.1.0dev20090501 from /kolab/lib/php
 
 	Use Archive_Tar-1.3.2 from /kolab/lib/php

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kolab-webclient.spec	11 May 2009 15:58:14 -0000	1.32
+++ kolab-webclient.spec	11 May 2009 19:12:03 -0000	1.33
@@ -153,6 +153,9 @@
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Util.php
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Variables.php
 
+	# Use Horde_NLS-0.0.2dev20090501 from /kolab/lib/php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/NLS*
+
 	# Kolab_Format is in sync
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Format*