gunnar: server/kolab-fbview ChangeLog, 1.4, 1.5 kolab-fbview.spec, 1.11, 1.12

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-fbview
In directory doto:/tmp/cvs-serv14488/kolab-fbview

Modified Files:
	ChangeLog kolab-fbview.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-fbview/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	26 Apr 2009 21:27:12 -0000	1.4
+++ ChangeLog	11 May 2009 13:05:32 -0000	1.5
@@ -1,3 +1,13 @@
+2009-05-11  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-fbview.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-fbview.spec: 

Index: kolab-fbview.spec
===================================================================
RCS file: /kolabrepository/server/kolab-fbview/kolab-fbview.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolab-fbview.spec	26 Apr 2009 21:27:12 -0000	1.11
+++ kolab-fbview.spec	11 May 2009 13:05:32 -0000	1.12
@@ -93,6 +93,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*