OpenPKG Specs / changeset

     1.1 --- a/bacula/bacula.patch	Mon Apr 06 12:50:20 2009 +0200
     1.2 +++ b/bacula/bacula.patch	Mon Apr 06 16:51:32 2009 +0200
     1.3 @@ -92,16 +92,16 @@
     1.4  diff -Nau scripts/btraceback.in.orig scripts/btraceback.in
     1.5  --- scripts/btraceback.in.orig	2008-06-01 10:49:00.000000000 +0200
     1.6  +++ scripts/btraceback.in	2008-11-19 23:09:44.305993544 +0100
     1.7 -@@ -12,6 +12,9 @@
     1.8 - PNAME="${PNAME} on `hostname`"
     1.9 +@@ -13,6 +13,9 @@
    1.10 + WD="@working_dir@"
    1.11   if test `uname -s` = SunOS ; then
    1.12 -   gcore -o @working_dir@/${PNAME} $2
    1.13 +   gcore -o ${WD}/${PNAME} $2
    1.14  +fi
    1.15  +if test `uname -s` = SunOS &&
    1.16  +   test -n `which dbx 2>/dev/null` ; then
    1.17 -   dbx $1 $2 <@scriptdir@/btraceback.dbx 2>&1 \
    1.18 +   dbx $1 $2 <@scriptdir@/btraceback.dbx >${WD}/bacula.$$.traceback 2>&1
    1.19 +   cat ${WD}/bacula.$$.traceback \
    1.20      | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
    1.21 - else
    1.22  Index: src/dird/bacula-dir.conf.in
    1.23  diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
    1.24  --- src/dird/bacula-dir.conf.in.orig	2008-06-19 21:44:34.000000000 +0200

     2.1 --- a/bacula/bacula.spec	Mon Apr 06 12:50:20 2009 +0200
     2.2 +++ b/bacula/bacula.spec	Mon Apr 06 16:51:32 2009 +0200
     2.3 @@ -31,8 +31,8 @@
     2.4  Class:        PLUS
     2.5  Group:        System
     2.6  License:      GPL
     2.7 -Version:      2.4.3
     2.8 -Release:      20081118
     2.9 +Version:      2.4.4
    2.10 +Release:      20090405
    2.11  
    2.12  #   package options
    2.13  %option       with_server       yes
    2.14 @@ -253,7 +253,7 @@
    2.15      #  done
    2.16      #) || exit $?
    2.17  
    2.18 -    #   install run-command script
    2.19 +    #   install runcommand script
    2.20      %{l_shtool} install -c -m 755 %{l_value -s -a} \
    2.21          -e 's,@with_server@,%{with_server},g' \
    2.22          %{SOURCE rc.bacula} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
    2.23 @@ -261,24 +261,18 @@
    2.24      #   determine installation files
    2.25      %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
    2.26          %{l_files_std} \
    2.27 -        '%attr(640,%{l_musr},%{l_mgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bconsole.conf' \
    2.28 -        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula' \
    2.29 -        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
    2.30 -        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
    2.31 +        '%config(noreplace) %{l_prefix}/etc/bacula/*.conf' \
    2.32 +%if "%{with_server}" == "yes"
    2.33 +        '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
    2.34 +        '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
    2.35 +        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup' \
    2.36 +        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
    2.37 +%endif
    2.38          '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/dvd-handler' \
    2.39          '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/mtx-changer' \
    2.40 -%if "%{with_server}" == "yes"
    2.41 -        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \
    2.42 -        '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup'\
    2.43 -        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \
    2.44 -        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \
    2.45 -%endif
    2.46 -        '%config(noreplace) %{l_prefix}/etc/bacula/bacula-fd.conf' \
    2.47 -%if "%{with_server}" == "yes"
    2.48 -        '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-dir.conf' \
    2.49 -        '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-sd.conf' \
    2.50 -%endif
    2.51 -        '%attr(640,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/bacula/bacula-fd.conf'
    2.52 +        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
    2.53 +        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
    2.54 +        '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula'
    2.55  
    2.56  %files -f files
    2.57