gunnar: server/kolab-webclient kolab-webclient.spec, 1.23.2.6.2.8, 1.23.2.6.2.9

cvs at kolab.org cvs at kolab.org
Thu May 28 16:59:29 CEST 2009


Author: gunnar

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

Modified Files:
      Tag: suc_branch
	kolab-webclient.spec 
Log Message:
Now that we have templates we don't need to mark the single php config files as config. In addition templates don't need the noreplace option.

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.6.2.8
retrieving revision 1.23.2.6.2.9
diff -u -d -r1.23.2.6.2.8 -r1.23.2.6.2.9
--- kolab-webclient.spec	28 May 2009 14:26:36 -0000	1.23.2.6.2.8
+++ kolab-webclient.spec	28 May 2009 14:59:27 -0000	1.23.2.6.2.9
@@ -148,63 +148,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