gunnar: server/kolab-webclient ChangeLog, 1.19, 1.20 kolab-webclient.spec, 1.37, 1.38

cvs at kolab.org cvs at kolab.org
Fri Jul 24 09:33:08 CEST 2009


Author: gunnar

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

Modified Files:
	ChangeLog kolab-webclient.spec 
Log Message:
Finally removed all libraries and added the required dependencies.
        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.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChangeLog	12 Jul 2009 08:02:14 -0000	1.19
+++ ChangeLog	24 Jul 2009 07:33:06 -0000	1.20
@@ -1,3 +1,11 @@
+2009-07-24  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec:
+
+        kolab/issue3293 (Big code duplication and code version messup: Horde
+	                 libs in 2.2.1)
+
+
 2009-07-12  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: Removed the "pear" directory as all PEAR

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- kolab-webclient.spec	12 Jul 2009 08:02:14 -0000	1.37
+++ kolab-webclient.spec	24 Jul 2009 07:33:06 -0000	1.38
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 07
-%define         V_day   12
+%define         V_day   24
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1
@@ -85,6 +85,28 @@
 BuildPreReq:  OpenPKG, openpkg >= 20070603
 BuildPreReq:  php, php::with_pear = yes
 PreReq:       kolabd
+PreReq:       Horde_Alarm
+PreReq:       Horde_Block
+PreReq:       Horde_Compress
+PreReq:       Horde_Crypt
+PreReq:       Horde_Data
+PreReq:       Horde_Editor
+PreReq:       Horde_Feed
+PreReq:       Horde_File_PDF
+PreReq:       Horde_Form
+PreReq:       Horde_Http_Client
+PreReq:       Horde_Image
+PreReq:       Horde_Maintenance
+PreReq:       Horde_Mobile
+PreReq:       Horde_Net_SMS
+PreReq:       Horde_RPC
+PreReq:       Horde_SessionHandler
+PreReq:       Horde_Share
+PreReq:       Horde_SyncML
+PreReq:       Horde_Template
+PreReq:       Horde_Text_Filter
+PreReq:       Horde_Text_Flowed
+PreReq:       Horde_Tree
 PreReq:       Kolab_Format >= 1.0.1
 PreReq:       Kolab_Server >= 0.5.0
 PreReq:       Kolab_Storage >= 0.4.0
@@ -162,47 +184,14 @@
 	#
 	# kolab/issue3293 (Big code duplication and code version messup: Horde
         #                  libs in 2.2.1)
-
-	# Use Horde_Argv-0.1.0dev20090501 from /kolab/lib/php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Argv*
-
-	# Use Horde_Browser-0.0.2dev20090501 from /kolab/lib/php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Browser*
-
-	# Use Horde_Cache-0.1.0dev20090501 from /kolab/lib/php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Cache*
-
-	# Use Horde_Framework-0.1.0dev20090502 from /kolab/lib/php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Config.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Help.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Menu.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Registry.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Release.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Text.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*
-
-	# Use Horde_Util-0.1.0dev20090501 from /kolab/lib/php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Array.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/String.php
-	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
-
-	# Kolab_Format is in sync
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Format*
-
-	# Kolab_Server is in sync
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/IMAP*
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Server*
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Session.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Test/Server.php
-
-	# Kolab_Storage is in sync
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Deprecated.php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Storage*
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Test/Storage.php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/bundle.php
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/File
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Net
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/SyncML*
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Text
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/VFS*
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/XML
 
 	# Use the PEAR libraries from /kolab/lib/php
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear





More information about the commits mailing list