[bacula/f15] Fix rhbz#728693 and rhbz#726147

[Simone Caronni]

commit 67db50893ecfdd624f1afe091128510567ce326a
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jan 20 18:17:18 2012 +0100

    Fix rhbz#728693 and rhbz#726147

 bacula-5.0.3-log-path.patch |   17 ++++++++++++-----
 bacula-checkconf            |    2 +-
 bacula.spec                 |    7 +++++--
 3 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/bacula-5.0.3-log-path.patch b/bacula-5.0.3-log-path.patch
index 6cf1f30..ad05719 100644
--- a/bacula-5.0.3-log-path.patch
+++ b/bacula-5.0.3-log-path.patch
@@ -1,8 +1,15 @@
-diff --git a/bacula-5.0.3/src/dird/bacula-dir.conf.in b/bacula-5.0.3/src/dird/bacula-dir.conf.in
-index 922be44..54cca3f 100644
---- a/bacula-5.0.3/src/dird/bacula-dir.conf.in
-+++ b/bacula-5.0.3/src/dird/bacula-dir.conf.in
-@@ -273,7 +273,7 @@ Messages {
+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
+@@ -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
+@@ -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
diff --git a/bacula-checkconf b/bacula-checkconf
index d9a8bb7..da3bb25 100644
--- a/bacula-checkconf
+++ b/bacula-checkconf
@@ -9,7 +9,7 @@ if [ $# -ne 1 ]; then
 fi
 grep -q '^[^#].*_PASSWORD@@' $1
 if [ $? -eq 0 ]; then
-    echo "Error: Default password in config"
+    logger -st bacula-dir "Error: placeholder password in config file $1"
     exit 6
 fi
 
diff --git a/bacula.spec b/bacula.spec
index 3750ae4..683561a 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,7 +2,7 @@
 
 Name:			bacula
 Version:		5.0.3
-Release:		19%{?dist}
+Release:		20%{?dist}
 Summary:		Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:		GPLv2 with exceptions
@@ -367,7 +367,7 @@ pushd bacula-%{version}
 %patch4 -p2 -b .openssl
 %patch5 -p1 -b .queryfile
 %patch6 -p0 -b .python27
-%patch7 -p2 -b .log-path
+%patch7 -p1 -b .log-path
 %patch8 -p0 -b .priv
 %patch9 -p2 -b .tray-dir
 %patch10 -p0 -b .mysql55
@@ -1114,6 +1114,9 @@ fi
 
 
 %changelog
+* Mon Fri Jan 20 2012 Simone Caronni <negativo17 at gmail.com> - 5.0.3-20
+- Fix rhbz#728693 and rhbz#726147.
+
 * Wed Jan 11 2012 Simone Caronni <negativo17 at gmail.com> - 5.0.3-19
 - Add devel subpackage.
 - Split off docs subpackage.