OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Sep-2005 08:36:05
Branch: HEAD Handle: 2005090507360400
Modified files:
openpkg-src/bacula bacula.spec
Log:
- one more attempt to prevent creation of *.rpmnew
- add place for scripts
- tighten permissions
Summary:
Revision Changes Path
1.11 +16 -4 openpkg-src/bacula/bacula.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 bacula.spec
--- openpkg-src/bacula/bacula.spec 5 Sep 2005 06:06:16 -0000 1.10
+++ openpkg-src/bacula/bacula.spec 5 Sep 2005 06:36:04 -0000 1.11
@@ -144,6 +144,11 @@
configure
done
+ # for the same reason remove version informations from config files
+ %{l_shtool} subst \
+ -e "s;For Bacula release @VERSION@ .*;;" \
+ `find . -name "*.conf.in"`
+
# use localhost as default host
%{l_shtool} subst \
-e 's/s,@hostname@,$hostname,/s,@hostname@,localhost,/' \
@@ -208,6 +213,7 @@
$RPM_BUILD_ROOT%{l_prefix}/libexec/bacula \
$RPM_BUILD_ROOT%{l_prefix}/etc/bacula \
$RPM_BUILD_ROOT%{l_prefix}/etc/bacula/clients \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/bacula/scripts \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/var/bacula \
$RPM_BUILD_ROOT%{l_prefix}/var/bacula/run \
@@ -266,9 +272,9 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%attr(750,%{with_user},%{with_group}) %{l_prefix}/var/bacula' \
- '%attr(750,%{with_user},%{with_group}) %{l_prefix}/var/bacula/run' \
- '%attr(750,%{with_user},%{with_group})
%{l_prefix}/var/bacula/run/subsys' \
+ '%attr(700,%{with_user},%{with_group}) %{l_prefix}/var/bacula' \
+ '%attr(700,%{with_user},%{with_group}) %{l_prefix}/var/bacula/run' \
+ '%attr(700,%{with_user},%{with_group})
%{l_prefix}/var/bacula/run/subsys' \
'%attr(-,-,%{with_group}) %{l_prefix}/libexec/bacula/dvd-freespace' \
'%attr(-,-,%{with_group}) %{l_prefix}/libexec/bacula/dvd-writepart' \
'%attr(-,-,%{with_group}) %{l_prefix}/libexec/bacula/mtx-changer' \
@@ -277,13 +283,19 @@
'%config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
'%config(noreplace) %{l_prefix}/etc/bacula/bacula-fd.conf' \
'%config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
+ '%config(noreplace) %{l_prefix}/etc/bacula/bconsole.conf' \
+ '%attr(640,-,%{with_group}) %{l_prefix}/etc/bacula/bacula-sd.conf' \
+ '%attr(640,-,-) %{l_prefix}/etc/bacula/bacula-fd.conf' \
+ '%attr(640,-,%{with_group}) %{l_prefix}/etc/bacula/bacula-dir.conf' \
+ '%attr(640,-,-) %{l_prefix}/etc/bacula/bconsole.conf' \
%if "%{with_wxconsole}" == "yes"
'%config(noreplace) %{l_prefix}/etc/bacula/wx-console.conf' \
+ '%attr(640,-,-) %{l_prefix}/etc/bacula/wx-console.conf' \
%endif
%if "%{with_traymonitor}" == "yes"
'%config(noreplace) %{l_prefix}/etc/bacula/tray-monitor.conf' \
+ '%attr(640,-,-) %{l_prefix}/etc/bacula/tray-monitor.conf'
%endif
- '%config(noreplace) %{l_prefix}/etc/bacula/bconsole.conf'
%files -f files
%docdir %{l_docdir}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
