1.1 --- a/bacula/bacula.spec Mon Apr 06 12:50:20 2009 +0200
1.2 +++ b/bacula/bacula.spec Mon Apr 06 16:51:32 2009 +0200
1.3 @@ -31,8 +31,8 @@
1.4 Class: PLUS
1.5 Group: System
1.6 License: GPL
1.7 -Version: 2.4.3
1.8 -Release: 20081118
1.9 +Version: 2.4.4
1.10 +Release: 20090405
1.11
1.12 # package options
1.13 %option with_server yes
1.14 @@ -253,7 +253,7 @@
1.15 # done
1.16 #) || exit $?
1.17
1.18 - # install run-command script
1.19 + # install runcommand script
1.20 %{l_shtool} install -c -m 755 %{l_value -s -a} \
1.21 -e 's,@with_server@,%{with_server},g' \
1.22 %{SOURCE rc.bacula} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
1.23 @@ -261,24 +261,18 @@
1.24 # determine installation files
1.25 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
1.26 %{l_files_std} \
1.27 - '%attr(640,%{l_musr},%{l_mgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bconsole.conf' \
1.28 - '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula' \
1.29 - '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
1.30 - '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
1.31 + '%config(noreplace) %{l_prefix}/etc/bacula/*.conf' \
1.32 +%if "%{with_server}" == "yes"
1.33 + '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
1.34 + '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
1.35 + '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup' \
1.36 + '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
1.37 +%endif
1.38 '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/dvd-handler' \
1.39 '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/mtx-changer' \
1.40 -%if "%{with_server}" == "yes"
1.41 - '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
1.42 - '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup'\
1.43 - '%config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
1.44 - '%config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
1.45 -%endif
1.46 - '%config(noreplace) %{l_prefix}/etc/bacula/bacula-fd.conf' \
1.47 -%if "%{with_server}" == "yes"
1.48 - '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-dir.conf' \
1.49 - '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-sd.conf' \
1.50 -%endif
1.51 - '%attr(640,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/bacula/bacula-fd.conf'
1.52 + '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
1.53 + '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
1.54 + '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula'
1.55
1.56 %files -f files
1.57
