OpenPKG Specs / changeset

     1.1 --- a/bacula/bacula.patch	Tue Aug 28 18:35:45 2012 +0200
     1.2 +++ b/bacula/bacula.patch	Tue Aug 28 18:36:20 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: manpages/Makefile.in
     1.5  diff -Nau manpages/Makefile.in.orig manpages/Makefile.in
     1.6 ---- manpages/Makefile.in.orig	2007-04-24 17:47:01.000000000 +0200
     1.7 -+++ manpages/Makefile.in	2008-11-19 22:55:01.066689027 +0100
     1.8 +--- manpages/Makefile.in.orig	2010-08-05 16:29:51.000000000 +0200
     1.9 ++++ manpages/Makefile.in	2011-05-01 17:26:43.000000000 +0200
    1.10  @@ -20,23 +20,21 @@
    1.11   install:
    1.12   	$(MKDIR) $(DESTDIR)/$(mandir)/man8
    1.13 @@ -34,8 +34,8 @@
    1.14   clean:
    1.15  Index: scripts/bacula.in
    1.16  diff -Nau scripts/bacula.in.orig scripts/bacula.in
    1.17 ---- scripts/bacula.in.orig	2008-07-24 17:02:06.000000000 +0200
    1.18 -+++ scripts/bacula.in	2009-09-17 00:40:53.423969596 +0200
    1.19 +--- scripts/bacula.in.orig	2010-08-05 16:29:51.000000000 +0200
    1.20 ++++ scripts/bacula.in	2011-05-01 17:26:43.000000000 +0200
    1.21  @@ -13,37 +13,43 @@
    1.22   #  easier to "steal" this code for the development 
    1.23   #  environment where they are different.
    1.24 @@ -93,24 +93,10 @@
    1.25         ;;
    1.26   
    1.27      *)
    1.28 -Index: scripts/btraceback.in
    1.29 -diff -Nau scripts/btraceback.in.orig scripts/btraceback.in
    1.30 ---- scripts/btraceback.in.orig	2008-06-01 10:49:00.000000000 +0200
    1.31 -+++ scripts/btraceback.in	2008-11-19 23:09:44.305993544 +0100
    1.32 -@@ -13,6 +13,9 @@
    1.33 - WD="@working_dir@"
    1.34 - if test `uname -s` = SunOS ; then
    1.35 -   gcore -o ${WD}/${PNAME} $2
    1.36 -+fi
    1.37 -+if test `uname -s` = SunOS &&
    1.38 -+   test -n `which dbx 2>/dev/null` ; then
    1.39 -   dbx $1 $2 <@scriptdir@/btraceback.dbx >${WD}/bacula.$$.traceback 2>&1
    1.40 -   cat ${WD}/bacula.$$.traceback \
    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	2009-07-15 19:05:40.000000000 +0200
    1.45 -+++ src/dird/bacula-dir.conf.in	2009-09-17 00:45:04.055970595 +0200
    1.46 +--- src/dird/bacula-dir.conf.in.orig	2010-08-05 16:29:51.000000000 +0200
    1.47 ++++ src/dird/bacula-dir.conf.in	2011-05-01 17:26:43.000000000 +0200
    1.48  @@ -29,7 +29,8 @@
    1.49     Level = Incremental
    1.50     Client = @basename@-fd 

     2.1 --- a/bacula/bacula.spec	Tue Aug 28 18:35:45 2012 +0200
     2.2 +++ b/bacula/bacula.spec	Tue Aug 28 18:36:20 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  bacula.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.7 +##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -40,8 +40,8 @@
    2.12  Class:        PLUS
    2.13  Group:        System
    2.14  License:      GPL
    2.15 -Version:      3.0.3
    2.16 -Release:      20091028
    2.17 +Version:      5.0.3
    2.18 +Release:      20120208
    2.19  
    2.20  #   package options
    2.21  %option       with_server       yes
    2.22 @@ -50,7 +50,15 @@
    2.23  %option       with_dvd          no
    2.24  %option       with_mtx          no
    2.25  %option       with_python       no
    2.26 -%option       with_dbback       sqlite
    2.27 +%option       with_db_sqlite    no
    2.28 +%option       with_db_pgsql     no
    2.29 +%option       with_db_mysql     no
    2.30 +
    2.31 +#   package option sanity check
    2.32 +%if "%{with_db_sqlite}" == "no" && "%{with_db_mysql}" == "no" && "%{with_db_pgsql}" == "no"
    2.33 +%undefine     with_db_sqlite
    2.34 +%define       with_db_sqlite    yes
    2.35 +%endif
    2.36  
    2.37  #   list of sources
    2.38  Source0:      http://switch.dl.sourceforge.net/bacula/bacula-%{version}.tar.gz
    2.39 @@ -63,8 +71,8 @@
    2.40  BuildRoot:    %{l_buildroot}
    2.41  BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes
    2.42  PreReq:       OpenPKG, openpkg >= 20060823
    2.43 -BuildPreReq:  ncurses, readline, zlib, gawk
    2.44 -PreReq:       ncurses, readline, zlib, gawk
    2.45 +BuildPreReq:  ncurses, readline, zlib
    2.46 +PreReq:       ncurses, readline, zlib
    2.47  %if "%{with_ssl}" == "yes"
    2.48  BuildPreReq:  openssl >= 0.9.8, openssl::with_threads = yes
    2.49  PreReq:       openssl >= 0.9.8, openssl::with_threads = yes
    2.50 @@ -73,15 +81,15 @@
    2.51  BuildPreReq:  tcpwrappers
    2.52  PreReq:       tcpwrappers
    2.53  %endif
    2.54 -%if "%{with_dbback}" == "sqlite"
    2.55 +%if "%{with_db_sqlite}" == "yes"
    2.56  BuildPreReq:  sqlite
    2.57  PreReq:       sqlite
    2.58  %endif
    2.59 -%if "%{with_dbback}" == "mysql"
    2.60 +%if "%{with_db_mysql}" == "yes"
    2.61  BuildPreReq:  mysql
    2.62  PreReq:       mysql
    2.63  %endif
    2.64 -%if "%{with_dbback}" == "postgresql"
    2.65 +%if "%{with_db_pgsql}" == "yes"
    2.66  BuildPreReq:  postgresql
    2.67  PreReq:       postgresql
    2.68  %endif
    2.69 @@ -112,7 +120,7 @@
    2.70  %track
    2.71      prog bacula = {
    2.72          version   = %{version}
    2.73 -        url       = http://prdownloads.sourceforge.net/bacula/
    2.74 +        url       = http://sourceforge.net/projects/bacula/files/
    2.75          regex     = bacula-(\d+\.\d*[02468]\.\d+)\.tar\.gz
    2.76      }
    2.77  
    2.78 @@ -145,13 +153,14 @@
    2.79      #   configure
    2.80      LIBS=
    2.81      case "%{l_platform -t}" in
    2.82 -        *-linux*) LIBS="-L/usr/lib/termcap";;
    2.83 +        *-linux*) ldfl="-L/usr/lib/termcap" ;;
    2.84 +        *-sunos*) ldfl="-ldl" ;;
    2.85      esac
    2.86      CC="%{l_cc}" \
    2.87      CFLAGS="%{l_cflags -O}" \
    2.88      CPPFLAGS="%{l_cppflags ncurses}" \
    2.89 -    LDFLAGS="%{l_ldflags} $LIBS" \
    2.90 -    LIBS="$libs" \
    2.91 +    LDFLAGS="%{l_ldflags} $ldfl" \
    2.92 +    LIBS="$libs -lz" \
    2.93      GREP="grep" \
    2.94      ./configure \
    2.95          --prefix=%{l_prefix} \
    2.96 @@ -179,13 +188,13 @@
    2.97  %if "%{with_wrap}" == "yes"
    2.98          --with-tcp-wrappers=yes \
    2.99  %endif
   2.100 -%if "%{with_dbback}" == "sqlite"
   2.101 +%if "%{with_db_sqlite}" == "yes"
   2.102          --with-sqlite3=%{l_prefix} \
   2.103  %endif
   2.104 -%if "%{with_dbback}" == "mysql"
   2.105 +%if "%{with_db_mysql}" == "yes"
   2.106          --with-mysql=%{l_prefix} \
   2.107  %endif
   2.108 -%if "%{with_dbback}" == "postgresql"
   2.109 +%if "%{with_db_pgsql}" == "yes"
   2.110          --with-postgresql=%{l_prefix} \
   2.111  %endif
   2.112  %if "%{with_python}" == "yes" || "%{with_dvd}" == "yes"
   2.113 @@ -209,6 +218,7 @@
   2.114      %{l_make} %{l_mflags -O}
   2.115  
   2.116  %install
   2.117 +    #   clean up build cruft
   2.118      rm -rf $RPM_BUILD_ROOT
   2.119  
   2.120      #   create installation hierarchy