From ce9f1156cb42f256d6bb7acb005d423efac65e79 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Jul 16 2012 08:11:22 +0000
Subject: Fix log path as in f17/rawhide builds (rhbz#837706)


---

diff --git a/bacula-5.0.3-log-path.patch b/bacula-5.0.3-log-path.patch
index ad05719..31723f2 100644
--- a/bacula-5.0.3-log-path.patch
+++ b/bacula-5.0.3-log-path.patch
@@ -1,20 +1,29 @@
 diff -Naur bacula-5.0.3.old/scripts/logwatch/logfile.bacula.conf.in bacula-5.0.3/scripts/logwatch/logfile.bacula.conf.in
---- bacula-5.0.3.old/scripts/logwatch/logfile.bacula.conf.in	2012-01-20 18:09:19.349611657 +0100
-+++ bacula-5.0.3/scripts/logwatch/logfile.bacula.conf.in	2012-01-20 18:12:23.448008201 +0100
+--- bacula-5.0.3.old/scripts/logwatch/logfile.bacula.conf.in	2012-07-16 10:05:24.185554621 +0200
++++ bacula-5.0.3/scripts/logwatch/logfile.bacula.conf.in	2012-07-16 10:05:51.179745516 +0200
 @@ -1,3 +1,4 @@
  # What actual file?  Defaults to LogPath if not absolute path....
  LogFile = @working_dir@/log
 +LogFile = @logdir@/bacula.log
  
 diff -Naur bacula-5.0.3.old/src/dird/bacula-dir.conf.in bacula-5.0.3/src/dird/bacula-dir.conf.in
---- bacula-5.0.3.old/src/dird/bacula-dir.conf.in	2012-01-20 18:09:19.272610248 +0100
-+++ bacula-5.0.3/src/dird/bacula-dir.conf.in	2012-01-20 18:11:43.658269288 +0100
+--- bacula-5.0.3.old/src/dird/bacula-dir.conf.in	2012-07-16 10:05:24.065553694 +0200
++++ bacula-5.0.3/src/dird/bacula-dir.conf.in	2012-07-16 10:05:51.179745516 +0200
+@@ -261,7 +261,7 @@
+ #          time to time as it will grow indefinitely. However, it will
+ #          also keep all your messages if they scroll off the console.
+ #
+-  append = "@working_dir@/log" = all, !skipped
++  append = "@logdir@/bacula.log" = all, !skipped
+   catalog = all
+ }
+ 
 @@ -273,7 +273,7 @@
    mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
    mail = @job_email@ = all, !skipped            
    console = all, !skipped, !saved
 -  append = "@working_dir@/log" = all, !skipped
-+  append = "/var/log/bacula/bacula.log" = all, !skipped
++  append = "@logdir@/bacula.log" = all, !skipped
  }
  
  # Default pool definition
diff --git a/bacula.logrotate b/bacula.logrotate
index ded3b7a..c14fede 100644
--- a/bacula.logrotate
+++ b/bacula.logrotate
@@ -1,6 +1,6 @@
 # Bacula logrotate script
 
-/var/log/bacula/*.log /var/spool/bacula/log {
+/var/log/bacula/*.log {
     monthly
     rotate 4
     notifempty
diff --git a/bacula.spec b/bacula.spec
index c03a4d3..f53b1a3 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:			bacula
 Version:		5.0.3
-Release:		29%{?dist}
+Release:		30%{?dist}
 Summary:		Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:		AGPLv3 with exceptions
@@ -467,6 +467,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 	--with-mon-fd-password=@@MON_FD_PASSWORD@@ \
 	--with-mon-sd-password=@@MON_SD_PASSWORD@@ \
 	--with-working-dir=%{_localstatedir}/spool/bacula \
+	--with-logdir=%{_localstatedir}/log/bacula \
 	--with-scriptdir=%{_libexecdir}/bacula \
 	--with-smtp-host=localhost \
 	--with-subsys-dir=%{_localstatedir}/lock/subsys \
@@ -1252,6 +1253,9 @@ fi
 
 
 %changelog
+* Mon Jul 16 2012 Simone Caronni <negativo17@gmail.com> - 5.0.3-30
+- Fix log path as in f17/rawhide builds (rhbz#837706).
+
 * Mon Jul 02 2012 Simone Caronni <negativo17@gmail.com> - 5.0.3-29
 - Remove leftover script.