gunnar: server/kolab-webclient kolab-webclient.spec,1.33,1.34

cvs at kolab.org cvs at kolab.org
Thu Jul 9 21:45:41 CEST 2009


Author: gunnar

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

Modified Files:
	kolab-webclient.spec 
Log Message:
Fix configuration file definition, remove further library parts

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- kolab-webclient.spec	11 May 2009 19:12:03 -0000	1.33
+++ kolab-webclient.spec	9 Jul 2009 19:45:38 -0000	1.34
@@ -147,15 +147,33 @@
 	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
 
+	# 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
 
-	# Use Horde_NLS-0.0.2dev20090501 from /kolab/lib/php
-	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/NLS*
-
 	# Kolab_Format is in sync
 	rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/lib/Horde/Kolab/Format*
 
@@ -197,63 +215,53 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kolab-conf.template' \
-	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kronolith-kolab-conf.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-config_hooks.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-config_mime_drivers.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-config_motd.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-config_nls.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-config_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-config_registry.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-dimp_conf.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-dimp_hooks.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-dimp_menu.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-dimp_portal.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-dimp_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-dimp_servers.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_conf.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_header.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_hooks.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_menu.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_mime_drivers.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_motd.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_servers.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-imp_spelling.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-ingo_backends.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-ingo_conf.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-ingo_fields.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-ingo_hooks.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-ingo_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kronolith_keywords.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kronolith_menu.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kronolith_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-mimp_conf.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-mimp_menu.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-mimp_mime_drivers.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-mimp_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-mnemo_conf.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-mnemo_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-nag_conf.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-nag_menu.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-nag_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-turba_attributes.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-turba_conf.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-turba_hooks.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-turba_menu.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-turba_mime_drivers.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-turba_prefs.php.template' \
-            '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-turba_sources.php.template' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/dimp/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/imp/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/ingo/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/kronolith/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/mimp/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/mnemo/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/nag/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/passwd/config/*.php' \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/turba/config/*.php' \
+	    '%config %{l_prefix}/etc/kolab/templates/webclient-kolab-conf.template' \
+	    '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith-kolab-conf.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-config_hooks.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-config_mime_drivers.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-config_motd.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-config_nls.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-config_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-config_registry.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_conf.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_hooks.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_menu.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_portal.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_servers.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_conf.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_header.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_hooks.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_menu.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_mime_drivers.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_motd.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_servers.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-imp_spelling.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_backends.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_conf.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_fields.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_hooks.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-ingo_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_keywords.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_menu.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_conf.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_menu.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_mime_drivers.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-mimp_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-mnemo_conf.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-mnemo_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-nag_conf.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-nag_menu.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-nag_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-turba_attributes.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-turba_conf.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-turba_hooks.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-turba_menu.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-turba_mime_drivers.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-turba_prefs.php.template' \
+            '%config %{l_prefix}/etc/kolab/templates/webclient-turba_sources.php.template' \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/log \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/tmp \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage \





More information about the commits mailing list