gunnar: server/kolab-webclient ChangeLog, 1.14, 1.15 kolab-webclient.spec, 1.30, 1.31

cvs at kolab.org cvs at kolab.org
Mon May 11 15:05:34 CEST 2009


Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv14488/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.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	26 Apr 2009 09:48:33 -0000	1.14
+++ ChangeLog	11 May 2009 13:05:32 -0000	1.15
@@ -1,3 +1,13 @@
+2009-05-11  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: 
+
+	Use Archive_Tar-1.3.2 from /kolab/lib/php
+	Use Structures_Graph-1.0.2 from /kolab/lib/php
+	Use Console_Getopt-1.2.3 from /kolab/lib/php
+	Use XML_Util-1.2.1 from /kolab/lib/php
+	Use PEAR-1.7.2 from /kolab/lib/php
+
 2009-04-26  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.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- kolab-webclient.spec	26 Apr 2009 10:33:41 -0000	1.30
+++ kolab-webclient.spec	11 May 2009 13:05:32 -0000	1.31
@@ -131,6 +131,22 @@
 	# kolab/issue3293 (Big code duplication and code version messup: Horde
         #                  libs in 2.2.1)
 
+	# Use Archive_Tar-1.3.2 from /kolab/lib/php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Archive/Tar.php
+
+	# Use Structures_Graph-1.0.2 from /kolab/lib/php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Structures
+
+	# Use Console_Getopt-1.2.3 from /kolab/lib/php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/Console/Getopt.php
+
+	# Use XML_Util-1.2.1 from /kolab/lib/php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/XML/Util.php
+
+	# Use PEAR-1.7.2 from /kolab/lib/php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/OS/Guess.php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear/PEAR
+
 	# Kolab_Format is in sync
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Format*
 





More information about the commits mailing list