gunnar: server/kolab-webclient kolab-webclient.spec,1.38,1.39

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	kolab-webclient.spec 
Log Message:
Use the horde package for the base installation.

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- kolab-webclient.spec	24 Jul 2009 07:33:06 -0000	1.38
+++ kolab-webclient.spec	18 Jan 2010 16:00:20 -0000	1.39
@@ -1,9 +1,9 @@
-# Versions
+# Macros
 %define         V_horde_name horde-webmail
 %define         V_package kolab-webclient
-%define         V_year  2009
-%define         V_month 07
-%define         V_day   24
+%define         V_year  2010
+%define         V_month 01
+%define         V_day   18
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1
@@ -84,35 +84,7 @@
 #Pre requisites
 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
-# Needed by horde
-PreReq:       PEAR-Services_Weather
-PreReq:       PEAR-DB
+PreReq:       horde >= 3.3.6
 # Needed by horde (translation.php)
 PreReq:       PEAR-Console_Table
 PreReq:       PEAR-File_Find
@@ -196,7 +168,8 @@
 	# Use the PEAR libraries from /kolab/lib/php
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/pear
 
-        sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/storage/horde.db < scripts/sql/groupware.sql
+	# Remove the base horde application. It is now installed as a separate package.
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/{COPYING,admin,docs,js,locale,po,rpc.php,services,templates,themes,README,config,index.php,lib,login.php,rpc,scripts,signup.php,test.php,util}
 
 	cd ..