diff -r fe49d631b225 -r a6cd892638c1 bacula/bacula.spec
--- a/bacula/bacula.spec	Sat Oct 03 16:15:32 2009 +0200
+++ b/bacula/bacula.spec	Sat Oct 03 16:18:52 2009 +0200
@@ -21,6 +21,11 @@
 ##  SUCH DAMAGE.
 ##
 
+# MSvB:
+# MSvB: Note, see http://www.bacula.org/en/?page=news
+# MSvB: for information on new configuration options.
+# MSvB:
+
 #   package information
 Name:         bacula
 Summary:      Network Backup Tool
@@ -31,8 +36,8 @@
 Class:        PLUS
 Group:        System
 License:      GPL
-Version:      2.4.4
-Release:      20090405
+Version:      3.0.2
+Release:      20090916
 
 #   package options
 %option       with_server       yes
@@ -41,15 +46,7 @@
 %option       with_dvd          no
 %option       with_mtx          no
 %option       with_python       no
-%option       with_db_sqlite    no
-%option       with_db_pgsql     no
-%option       with_db_mysql     no
-
-#   package option sanity check
-%if "%{with_db_sqlite}" == "no" && "%{with_db_mysql}" == "no" && "%{with_db_pgsql}" == "no"
-%undefine     with_db_sqlite
-%define       with_db_sqlite    yes
-%endif
+%option       with_dbback       sqlite
 
 #   list of sources
 Source0:      http://switch.dl.sourceforge.net/bacula/bacula-%{version}.tar.gz
@@ -62,25 +59,25 @@
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes
 PreReq:       OpenPKG, openpkg >= 20060823
-BuildPreReq:  ncurses, readline, zlib
-PreReq:       ncurses, readline, zlib
+BuildPreReq:  ncurses, readline, zlib, gawk
+PreReq:       ncurses, readline, zlib, gawk
 %if "%{with_ssl}" == "yes"
-BuildPreReq:  openssl >= 0.9.8
-PreReq:       openssl >= 0.9.8
+BuildPreReq:  openssl >= 0.9.8, openssl::with_threads = yes
+PreReq:       openssl >= 0.9.8, openssl::with_threads = yes
 %endif
 %if "%{with_wrap}" == "yes"
 BuildPreReq:  tcpwrappers
 PreReq:       tcpwrappers
 %endif
-%if "%{with_db_sqlite}" == "yes"
+%if "%{with_dbback}" == "sqlite"
 BuildPreReq:  sqlite
 PreReq:       sqlite
 %endif
-%if "%{with_db_mysql}" == "yes"
+%if "%{with_dbback}" == "mysql"
 BuildPreReq:  mysql
 PreReq:       mysql
 %endif
-%if "%{with_db_pgsql}" == "yes"
+%if "%{with_dbback}" == "postgresql"
 BuildPreReq:  postgresql
 PreReq:       postgresql
 %endif
@@ -178,13 +175,13 @@
 %if "%{with_wrap}" == "yes"
         --with-tcp-wrappers=yes \
 %endif
-%if "%{with_db_sqlite}" == "yes"
+%if "%{with_dbback}" == "sqlite"
         --with-sqlite3=%{l_prefix} \
 %endif
-%if "%{with_db_mysql}" == "yes"
+%if "%{with_dbback}" == "mysql"
         --with-mysql=%{l_prefix} \
 %endif
-%if "%{with_db_pgsql}" == "yes"
+%if "%{with_dbback}" == "postgresql"
         --with-postgresql=%{l_prefix} \
 %endif
 %if "%{with_python}" == "yes" || "%{with_dvd}" == "yes"
@@ -200,6 +197,7 @@
         --with-subsys-dir=%{l_prefix}/var/bacula/run/subsys \
         --with-archivedir=/tmp \
         --with-sbin-perm=0755 \
+        --disable-libtool \
         --disable-nls
 
     #   build
@@ -221,9 +219,7 @@
         $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run \
         $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run/subsys \
         $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
-        $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
-        $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples \
-        $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples/default-config
+        $RPM_BUILD_ROOT%{l_prefix}/man/man8
 
     #   install
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT