gunnar: server/kolab-webclient/horde horde.spec,1.7,1.8

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	horde.spec 
Log Message:
Removed two useless portal blocks and ensured the other ones are working.

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde.spec	19 Jan 2010 04:47:13 -0000	1.7
+++ horde.spec	21 Jan 2010 19:57:42 -0000	1.8
@@ -49,6 +49,7 @@
 PreReq:       Horde_Form
 PreReq:       Horde_Http_Client
 PreReq:       Horde_Image
+PreReq:       Horde_Loader
 PreReq:       Horde_Maintenance
 PreReq:       Horde_Mobile
 PreReq:       Horde_Net_SMS
@@ -65,7 +66,6 @@
 PreReq:       Kolab_Server >= 0.5.0
 PreReq:       Kolab_Storage >= 0.4.0
 # Needed by horde
-PreReq:       PEAR-Services_Weather
 PreReq:       PEAR-DB
 # Needed by horde (translation.php)
 PreReq:       PEAR-Console_Table
@@ -132,6 +132,15 @@
 	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
+
+	# Remove the Google search portal block. It requires applying for a search API key
+	# and is not really explained. It will confuse users as does nothing without
+	# admin intervention.
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Block/google.php
+
+	# Remove the weather data portal block. It is not really documented and I don't
+	# think the effort is worth it. In its current state it is simply confusing.
+	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Block/metar.php
 
         sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_alarms.sql
         sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/horde.db < scripts/sql/horde_perms.sql