1.1 --- a/bacula/bacula.spec Sat Oct 03 16:15:32 2009 +0200
1.2 +++ b/bacula/bacula.spec Sat Oct 03 16:18:52 2009 +0200
1.3 @@ -21,6 +21,11 @@
1.4 ## SUCH DAMAGE.
1.5 ##
1.6
1.7 +# MSvB:
1.8 +# MSvB: Note, see http://www.bacula.org/en/?page=news
1.9 +# MSvB: for information on new configuration options.
1.10 +# MSvB:
1.11 +
1.12 # package information
1.13 Name: bacula
1.14 Summary: Network Backup Tool
1.15 @@ -31,8 +36,8 @@
1.16 Class: PLUS
1.17 Group: System
1.18 License: GPL
1.19 -Version: 2.4.4
1.20 -Release: 20090405
1.21 +Version: 3.0.2
1.22 +Release: 20090916
1.23
1.24 # package options
1.25 %option with_server yes
1.26 @@ -41,15 +46,7 @@
1.27 %option with_dvd no
1.28 %option with_mtx no
1.29 %option with_python no
1.30 -%option with_db_sqlite no
1.31 -%option with_db_pgsql no
1.32 -%option with_db_mysql no
1.33 -
1.34 -# package option sanity check
1.35 -%if "%{with_db_sqlite}" == "no" && "%{with_db_mysql}" == "no" && "%{with_db_pgsql}" == "no"
1.36 -%undefine with_db_sqlite
1.37 -%define with_db_sqlite yes
1.38 -%endif
1.39 +%option with_dbback sqlite
1.40
1.41 # list of sources
1.42 Source0: http://switch.dl.sourceforge.net/bacula/bacula-%{version}.tar.gz
1.43 @@ -62,25 +59,25 @@
1.44 BuildRoot: %{l_buildroot}
1.45 BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes
1.46 PreReq: OpenPKG, openpkg >= 20060823
1.47 -BuildPreReq: ncurses, readline, zlib
1.48 -PreReq: ncurses, readline, zlib
1.49 +BuildPreReq: ncurses, readline, zlib, gawk
1.50 +PreReq: ncurses, readline, zlib, gawk
1.51 %if "%{with_ssl}" == "yes"
1.52 -BuildPreReq: openssl >= 0.9.8
1.53 -PreReq: openssl >= 0.9.8
1.54 +BuildPreReq: openssl >= 0.9.8, openssl::with_threads = yes
1.55 +PreReq: openssl >= 0.9.8, openssl::with_threads = yes
1.56 %endif
1.57 %if "%{with_wrap}" == "yes"
1.58 BuildPreReq: tcpwrappers
1.59 PreReq: tcpwrappers
1.60 %endif
1.61 -%if "%{with_db_sqlite}" == "yes"
1.62 +%if "%{with_dbback}" == "sqlite"
1.63 BuildPreReq: sqlite
1.64 PreReq: sqlite
1.65 %endif
1.66 -%if "%{with_db_mysql}" == "yes"
1.67 +%if "%{with_dbback}" == "mysql"
1.68 BuildPreReq: mysql
1.69 PreReq: mysql
1.70 %endif
1.71 -%if "%{with_db_pgsql}" == "yes"
1.72 +%if "%{with_dbback}" == "postgresql"
1.73 BuildPreReq: postgresql
1.74 PreReq: postgresql
1.75 %endif
1.76 @@ -178,13 +175,13 @@
1.77 %if "%{with_wrap}" == "yes"
1.78 --with-tcp-wrappers=yes \
1.79 %endif
1.80 -%if "%{with_db_sqlite}" == "yes"
1.81 +%if "%{with_dbback}" == "sqlite"
1.82 --with-sqlite3=%{l_prefix} \
1.83 %endif
1.84 -%if "%{with_db_mysql}" == "yes"
1.85 +%if "%{with_dbback}" == "mysql"
1.86 --with-mysql=%{l_prefix} \
1.87 %endif
1.88 -%if "%{with_db_pgsql}" == "yes"
1.89 +%if "%{with_dbback}" == "postgresql"
1.90 --with-postgresql=%{l_prefix} \
1.91 %endif
1.92 %if "%{with_python}" == "yes" || "%{with_dvd}" == "yes"
1.93 @@ -200,6 +197,7 @@
1.94 --with-subsys-dir=%{l_prefix}/var/bacula/run/subsys \
1.95 --with-archivedir=/tmp \
1.96 --with-sbin-perm=0755 \
1.97 + --disable-libtool \
1.98 --disable-nls
1.99
1.100 # build
1.101 @@ -221,9 +219,7 @@
1.102 $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run \
1.103 $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run/subsys \
1.104 $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
1.105 - $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
1.106 - $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples \
1.107 - $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples/default-config
1.108 + $RPM_BUILD_ROOT%{l_prefix}/man/man8
1.109
1.110 # install
1.111 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
