OpenPKG Specs / changeset

     1.1 --- a/bacula/bacula.patch	Sat Oct 03 16:15:32 2009 +0200
     1.2 +++ b/bacula/bacula.patch	Sat Oct 03 16:18:52 2009 +0200
     1.3 @@ -31,17 +31,22 @@
     1.4  +	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
     1.5   	done
     1.6   
     1.7 - clean:	dummy
     1.8 + clean:
     1.9  Index: scripts/bacula.in
    1.10  diff -Nau scripts/bacula.in.orig scripts/bacula.in
    1.11 ---- scripts/bacula.in.orig	2008-07-06 15:06:15.000000000 +0200
    1.12 -+++ scripts/bacula.in	2008-11-19 23:08:15.438347068 +0100
    1.13 -@@ -13,32 +13,38 @@
    1.14 +--- scripts/bacula.in.orig	2008-07-24 17:02:06.000000000 +0200
    1.15 ++++ scripts/bacula.in	2009-09-17 00:40:53.423969596 +0200
    1.16 +@@ -13,37 +13,43 @@
    1.17   #  easier to "steal" this code for the development 
    1.18   #  environment where they are different.
    1.19   #  
    1.20  -SCRIPTDIR=@scriptdir@
    1.21  +SCRIPTDIR=@libexecdir@
    1.22 + #
    1.23 + # Disable Glibc malloc checks, it doesn't help and it keeps from getting
    1.24 + #   good dumps
    1.25 + MALLOC_CHECK_=0
    1.26 + export MALLOC_CHECK_
    1.27   
    1.28  -case "$1" in
    1.29  +action=$1
    1.30 @@ -65,8 +70,8 @@
    1.31  -      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
    1.32  -      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
    1.33  -      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
    1.34 ++      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
    1.35  +      [ "$enable_fd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
    1.36 -+      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
    1.37  +      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
    1.38         ;;
    1.39   
    1.40 @@ -104,11 +109,11 @@
    1.41      | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
    1.42  Index: src/dird/bacula-dir.conf.in
    1.43  diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
    1.44 ---- src/dird/bacula-dir.conf.in.orig	2008-06-19 21:44:34.000000000 +0200
    1.45 -+++ src/dird/bacula-dir.conf.in	2008-11-19 23:10:11.001069502 +0100
    1.46 +--- src/dird/bacula-dir.conf.in.orig	2009-07-15 19:05:40.000000000 +0200
    1.47 ++++ src/dird/bacula-dir.conf.in	2009-09-17 00:45:04.055970595 +0200
    1.48  @@ -29,7 +29,8 @@
    1.49     Level = Incremental
    1.50 -   Client = @hostname@-fd 
    1.51 +   Client = @basename@-fd 
    1.52     FileSet = "Full Set"
    1.53  -  Schedule = "WeeklyCycle"
    1.54  + #Schedule = "WeeklyCycle"
    1.55 @@ -120,12 +125,12 @@
    1.56   #    directory to give a reasonable FileSet to backup to
    1.57   #    disk storage during initial testing.
    1.58   #
    1.59 --    File = @BUILD_DIR@
    1.60 +-    File = @sbindir@
    1.61  +    File = @scriptdir@
    1.62     }
    1.63   
    1.64   #
    1.65 -@@ -124,6 +125,11 @@
    1.66 +@@ -126,6 +127,11 @@
    1.67     }
    1.68   }
    1.69   

     2.1 --- a/bacula/bacula.spec	Sat Oct 03 16:15:32 2009 +0200
     2.2 +++ b/bacula/bacula.spec	Sat Oct 03 16:18:52 2009 +0200
     2.3 @@ -21,6 +21,11 @@
     2.4  ##  SUCH DAMAGE.
     2.5  ##
     2.6  
     2.7 +# MSvB:
     2.8 +# MSvB: Note, see http://www.bacula.org/en/?page=news
     2.9 +# MSvB: for information on new configuration options.
    2.10 +# MSvB:
    2.11 +
    2.12  #   package information
    2.13  Name:         bacula
    2.14  Summary:      Network Backup Tool
    2.15 @@ -31,8 +36,8 @@
    2.16  Class:        PLUS
    2.17  Group:        System
    2.18  License:      GPL
    2.19 -Version:      2.4.4
    2.20 -Release:      20090405
    2.21 +Version:      3.0.2
    2.22 +Release:      20090916
    2.23  
    2.24  #   package options
    2.25  %option       with_server       yes
    2.26 @@ -41,15 +46,7 @@
    2.27  %option       with_dvd          no
    2.28  %option       with_mtx          no
    2.29  %option       with_python       no
    2.30 -%option       with_db_sqlite    no
    2.31 -%option       with_db_pgsql     no
    2.32 -%option       with_db_mysql     no
    2.33 -
    2.34 -#   package option sanity check
    2.35 -%if "%{with_db_sqlite}" == "no" && "%{with_db_mysql}" == "no" && "%{with_db_pgsql}" == "no"
    2.36 -%undefine     with_db_sqlite
    2.37 -%define       with_db_sqlite    yes
    2.38 -%endif
    2.39 +%option       with_dbback       sqlite
    2.40  
    2.41  #   list of sources
    2.42  Source0:      http://switch.dl.sourceforge.net/bacula/bacula-%{version}.tar.gz
    2.43 @@ -62,25 +59,25 @@
    2.44  BuildRoot:    %{l_buildroot}
    2.45  BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes
    2.46  PreReq:       OpenPKG, openpkg >= 20060823
    2.47 -BuildPreReq:  ncurses, readline, zlib
    2.48 -PreReq:       ncurses, readline, zlib
    2.49 +BuildPreReq:  ncurses, readline, zlib, gawk
    2.50 +PreReq:       ncurses, readline, zlib, gawk
    2.51  %if "%{with_ssl}" == "yes"
    2.52 -BuildPreReq:  openssl >= 0.9.8
    2.53 -PreReq:       openssl >= 0.9.8
    2.54 +BuildPreReq:  openssl >= 0.9.8, openssl::with_threads = yes
    2.55 +PreReq:       openssl >= 0.9.8, openssl::with_threads = yes
    2.56  %endif
    2.57  %if "%{with_wrap}" == "yes"
    2.58  BuildPreReq:  tcpwrappers
    2.59  PreReq:       tcpwrappers
    2.60  %endif
    2.61 -%if "%{with_db_sqlite}" == "yes"
    2.62 +%if "%{with_dbback}" == "sqlite"
    2.63  BuildPreReq:  sqlite
    2.64  PreReq:       sqlite
    2.65  %endif
    2.66 -%if "%{with_db_mysql}" == "yes"
    2.67 +%if "%{with_dbback}" == "mysql"
    2.68  BuildPreReq:  mysql
    2.69  PreReq:       mysql
    2.70  %endif
    2.71 -%if "%{with_db_pgsql}" == "yes"
    2.72 +%if "%{with_dbback}" == "postgresql"
    2.73  BuildPreReq:  postgresql
    2.74  PreReq:       postgresql
    2.75  %endif
    2.76 @@ -178,13 +175,13 @@
    2.77  %if "%{with_wrap}" == "yes"
    2.78          --with-tcp-wrappers=yes \
    2.79  %endif
    2.80 -%if "%{with_db_sqlite}" == "yes"
    2.81 +%if "%{with_dbback}" == "sqlite"
    2.82          --with-sqlite3=%{l_prefix} \
    2.83  %endif
    2.84 -%if "%{with_db_mysql}" == "yes"
    2.85 +%if "%{with_dbback}" == "mysql"
    2.86          --with-mysql=%{l_prefix} \
    2.87  %endif
    2.88 -%if "%{with_db_pgsql}" == "yes"
    2.89 +%if "%{with_dbback}" == "postgresql"
    2.90          --with-postgresql=%{l_prefix} \
    2.91  %endif
    2.92  %if "%{with_python}" == "yes" || "%{with_dvd}" == "yes"
    2.93 @@ -200,6 +197,7 @@
    2.94          --with-subsys-dir=%{l_prefix}/var/bacula/run/subsys \
    2.95          --with-archivedir=/tmp \
    2.96          --with-sbin-perm=0755 \
    2.97 +        --disable-libtool \
    2.98          --disable-nls
    2.99  
   2.100      #   build
   2.101 @@ -221,9 +219,7 @@
   2.102          $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run \
   2.103          $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run/subsys \
   2.104          $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
   2.105 -        $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
   2.106 -        $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples \
   2.107 -        $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples/default-config
   2.108 +        $RPM_BUILD_ROOT%{l_prefix}/man/man8
   2.109  
   2.110      #   install
   2.111      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT