# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1239029492 -7200
# Node ID c960abd3fd97edacc82f912cf08364d2c5e69fa0
# Parent  e41fe78aeff0eea58d976a93d6dbe08589dea1de
Update to new versions of vendor software and correct RPM attributes.

diff -r e41fe78aeff0 -r c960abd3fd97 bacula/bacula.patch
--- a/bacula/bacula.patch	Mon Apr 06 12:50:20 2009 +0200
+++ b/bacula/bacula.patch	Mon Apr 06 16:51:32 2009 +0200
@@ -92,16 +92,16 @@
 diff -Nau scripts/btraceback.in.orig scripts/btraceback.in
 --- scripts/btraceback.in.orig	2008-06-01 10:49:00.000000000 +0200
 +++ scripts/btraceback.in	2008-11-19 23:09:44.305993544 +0100
-@@ -12,6 +12,9 @@
- PNAME="${PNAME} on `hostname`"
+@@ -13,6 +13,9 @@
+ WD="@working_dir@"
  if test `uname -s` = SunOS ; then
-   gcore -o @working_dir@/${PNAME} $2
+   gcore -o ${WD}/${PNAME} $2
 +fi
 +if test `uname -s` = SunOS &&
 +   test -n `which dbx 2>/dev/null` ; then
-   dbx $1 $2 <@scriptdir@/btraceback.dbx 2>&1 \
+   dbx $1 $2 <@scriptdir@/btraceback.dbx >${WD}/bacula.$$.traceback 2>&1
+   cat ${WD}/bacula.$$.traceback \
     | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
- else
 Index: src/dird/bacula-dir.conf.in
 diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
 --- src/dird/bacula-dir.conf.in.orig	2008-06-19 21:44:34.000000000 +0200
diff -r e41fe78aeff0 -r c960abd3fd97 bacula/bacula.spec
--- a/bacula/bacula.spec	Mon Apr 06 12:50:20 2009 +0200
+++ b/bacula/bacula.spec	Mon Apr 06 16:51:32 2009 +0200
@@ -31,8 +31,8 @@
 Class:        PLUS
 Group:        System
 License:      GPL
-Version:      2.4.3
-Release:      20081118
+Version:      2.4.4
+Release:      20090405
 
 #   package options
 %option       with_server       yes
@@ -253,7 +253,7 @@
     #  done
     #) || exit $?
 
-    #   install run-command script
+    #   install runcommand script
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         -e 's,@with_server@,%{with_server},g' \
         %{SOURCE rc.bacula} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ -261,24 +261,18 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%attr(640,%{l_musr},%{l_mgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bconsole.conf' \
-        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula' \
-        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
-        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
+        '%config(noreplace) %{l_prefix}/etc/bacula/*.conf' \
+%if "%{with_server}" == "yes"
+        '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
+        '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
+        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup' \
+        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
+%endif
         '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/dvd-handler' \
         '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/mtx-changer' \
-%if "%{with_server}" == "yes"
-        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
-        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup'\
-        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
-        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
-%endif
-        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-fd.conf' \
-%if "%{with_server}" == "yes"
-        '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-dir.conf' \
-        '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-sd.conf' \
-%endif
-        '%attr(640,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/bacula/bacula-fd.conf'
+        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
+        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
+        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula'
 
 %files -f files