Fix logwatch install in bacula.spec. Patch from bug #1454

diff --git a/bacula/platforms/redhat/bacula.spec b/bacula/platforms/redhat/bacula.spec
index 7cf6f9bfaaf70ba42ff0f8cca8035eb0ef51a945..2d98d7fd7299a95729588c38d12c1fa1422be068 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec
+++ b/bacula/platforms/redhat/bacula.spec
@@ -841,6 +841,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/logwatch/conf/logfiles
 mkdir -p $RPM_BUILD_ROOT/etc/logwatch/conf/services
 mkdir -p $RPM_BUILD_ROOT/etc/logwatch/scripts/services
+mkdir -p $RPM_BUILD_ROOT/etc/logwatch/scripts/shared
 mkdir -p $RPM_BUILD_ROOT%{script_dir}/updatedb
 
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
@@ -911,9 +912,11 @@ cp -p updatedb/* $RPM_BUILD_ROOT%{script_dir}/updatedb/
 # install the logwatch scripts
 %if ! %{client_only}
 cp -p scripts/logwatch/bacula $RPM_BUILD_ROOT/etc/logwatch/scripts/services/bacula
+cp -p scripts/logwatch/applybacula $RPM_BUILD_ROOT/etc/logwatch/scripts/shared/applybacula
 cp -p scripts/logwatch/logfile.bacula.conf $RPM_BUILD_ROOT/etc/logwatch/conf/logfiles/bacula.conf
 cp -p scripts/logwatch/services.bacula.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/bacula.conf
 chmod 755 $RPM_BUILD_ROOT/etc/logwatch/scripts/services/bacula
+chmod 755 $RPM_BUILD_ROOT/etc/logwatch/scripts/shared/applybacula
 chmod 644 $RPM_BUILD_ROOT/etc/logwatch/conf/logfiles/bacula.conf
 chmod 644 $RPM_BUILD_ROOT/etc/logwatch/conf/services/bacula.conf
 %endif
@@ -1028,6 +1031,7 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 
 /etc/logrotate.d/bacula
 /etc/logwatch/scripts/services/bacula
+/etc/logwatch/scripts/shared/applybacula
 %attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-dir.conf
 %attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-fd.conf
 %attr(-, root, %{storage_daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-sd.conf

diff --git a/bacula/scripts/logwatch/README b/bacula/scripts/logwatch/README
index b3b8617fead19a0290b33b9e07878fcef11f76ee..96f68b3ba176809808d134d2200b6ab7e9d7b3cc 100644 (file)
--- a/bacula/scripts/logwatch/README
+++ b/bacula/scripts/logwatch/README
@@ -7,7 +7,7 @@ straightforward. Run 'make install' as root from this directory.
 For manual install copy the files as indicated below:
 
 cp -p scripts/logwatch/bacula /etc/log.d/scripts/services/bacula
-cp -p scripts/logwatch/bacula /etc/log.d/scripts/shared/applybaculadate
+cp -p scripts/logwatch/applybacula /etc/log.d/scripts/shared/applybaculadate
 cp -p scripts/logwatch/logfile.bacula.conf /etc/log.d/conf/logfiles/bacula.conf
 cp -p scripts/logwatch/services.bacula.conf /etc/log.d/conf/services/bacula.conf
 chmod 755 /etc/log.d/scripts/services/bacula
@@ -41,4 +41,3 @@ Jobs Run:
 
 
  ---------------------- bacula End ------------------------- 
-