thomas: server/kolabd/kolabd kolabd.spec.in,1.27,1.28

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv23523

Modified Files:
	kolabd.spec.in 
Log Message:
Make kolab.conf, quotawarning and templates owned by kolab instead of kolab-n

For kolab.conf and templates this is a security improvement, for quotawarning
just consistency.

Additionally mark kolab.conf as (noreplace) so it does not overwrite the
existing config file during upgrades.


Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- kolabd.spec.in	4 Jul 2008 15:26:23 -0000	1.27
+++ kolabd.spec.in	8 Jul 2008 17:30:58 -0000	1.28
@@ -116,14 +116,12 @@
 
     #   generate file list
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+	'%config(noreplace) %{l_prefix}/etc/kolab/kolab.conf' \
+	'%config %{l_prefix}/etc/kolab/quotawarning.txt' \
+	'%config %{l_prefix}/etc/kolab/templates/*.template' \
 	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/httpd_sessions \
 	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp \
-	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/php \
-        '%config %{l_prefix}/etc/kolab/*.pem' \
-        '%config %{l_prefix}/etc/kolab/*.schema' \
-        '%config %{l_prefix}/etc/kolab/kolab.conf' \
-	'%config %{l_prefix}/etc/kolab/quotawarning.txt' \
-	'%config %{l_prefix}/etc/kolab/templates/*.template'
+	%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/php
 
 %files -f files