diff -r e41fe78aeff0 -r c960abd3fd97 bacula/bacula.spec
--- a/bacula/bacula.spec	Mon Apr 06 12:50:20 2009 +0200
+++ b/bacula/bacula.spec	Mon Apr 06 16:51:32 2009 +0200
@@ -31,8 +31,8 @@
 Class:        PLUS
 Group:        System
 License:      GPL
-Version:      2.4.3
-Release:      20081118
+Version:      2.4.4
+Release:      20090405
 
 #   package options
 %option       with_server       yes
@@ -253,7 +253,7 @@
     #  done
     #) || exit $?
 
-    #   install run-command script
+    #   install runcommand script
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         -e 's,@with_server@,%{with_server},g' \
         %{SOURCE rc.bacula} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ -261,24 +261,18 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%attr(640,%{l_musr},%{l_mgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bconsole.conf' \
-        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula' \
-        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
-        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
+        '%config(noreplace) %{l_prefix}/etc/bacula/*.conf' \
+%if "%{with_server}" == "yes"
+        '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
+        '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
+        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup' \
+        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
+%endif
         '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/dvd-handler' \
         '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/mtx-changer' \
-%if "%{with_server}" == "yes"
-        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
-        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup'\
-        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
-        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
-%endif
-        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-fd.conf' \
-%if "%{with_server}" == "yes"
-        '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-dir.conf' \
-        '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-sd.conf' \
-%endif
-        '%attr(640,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/bacula/bacula-fd.conf'
+        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
+        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
+        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula'
 
 %files -f files