[bacula] Fix for rhbz#728693

[Simone Caronni]

commit 65d849bd380623526d9de45650ae221e1d41f7b7
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jan 20 18:03:42 2012 +0100

    Fix for rhbz#728693

 bacula-5.2.2-log-path.patch |   21 ---------------------
 bacula-5.2.4-log-path.patch |   29 +++++++++++++++++++++++++++++
 bacula.spec                 |    7 +++++--
 3 files changed, 34 insertions(+), 23 deletions(-)
---
diff --git a/bacula-5.2.4-log-path.patch b/bacula-5.2.4-log-path.patch
new file mode 100644
index 0000000..aec5d45
--- /dev/null
+++ b/bacula-5.2.4-log-path.patch
@@ -0,0 +1,29 @@
+diff -Naur bacula-5.2.2.old/src/dird/bacula-dir.conf.in bacula-5.2.2/src/dird/bacula-dir.conf.in
+--- bacula-5.2.2.old/src/dird/bacula-dir.conf.in	2011-12-05 14:14:52.730892121 +0100
++++ bacula-5.2.2/src/dird/bacula-dir.conf.in	2011-12-07 16:55:16.391276283 +0100
+@@ -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 = "@logdir@/bacula.log" = all, !skipped
+ }
+ 
+ # Default pool definition
+diff -Naur bacula-5.2.4.old/scripts/logwatch/logfile.bacula.conf.in bacula-5.2.4/scripts/logwatch/logfile.bacula.conf.in
+--- bacula-5.2.4.old/scripts/logwatch/logfile.bacula.conf.in	2012-01-20 17:56:38.650667075 +0100
++++ bacula-5.2.4/scripts/logwatch/logfile.bacula.conf.in	2012-01-20 17:58:24.199868050 +0100
+@@ -1,3 +1,4 @@
+ # What actual file?  Defaults to LogPath if not absolute path....
+ LogFile = @working_dir@/log
++LogFile = @logdir@/bacula.log
+ 
diff --git a/bacula.spec b/bacula.spec
index b31cc14..e82c53e 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:			bacula
 Version:		5.2.4
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:		GPLv2 with exceptions
@@ -31,7 +31,7 @@ Source18:		bacula-checkconf
 Patch1:			bacula-5.2.2-hostname.patch
 Patch2:			bacula-5.0.2-openssl.patch
 Patch3:			bacula-5.2.2-queryfile.patch
-Patch5:			bacula-5.2.2-log-path.patch
+Patch5:			bacula-5.2.4-log-path.patch
 Patch6:			bacula-5.0.3-sqlite-priv.patch
 Patch8:			bacula-5.2.2-qt-console-optflags.patch
 
@@ -797,6 +797,9 @@ fi
 
 
 %changelog
+* Fri Jan 20 2012 Simone Caronni <negativo17 at gmail.com> - 5.2.4-3
+- Fix for rhbz#728693.
+
 * Fri Jan 20 2012 Simone Caronni <negativo17 at gmail.com> - 5.2.4-2
 - Close bugs rhbz#708712, rhbz#556669, rhbz#726147