SPECS: bacula.spec - nfy; move to libdbi instead of native DB drivers

[mmazur]

Author: mmazur                       Date: Tue Apr 21 10:07:40 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- nfy; move to libdbi instead of native DB drivers

---- Files affected:
SPECS:
   bacula.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.107 SPECS/bacula.spec:1.108
--- SPECS/bacula.spec:1.107	Fri Apr 17 15:18:14 2009
+++ SPECS/bacula.spec	Tue Apr 21 12:07:34 2009
@@ -7,36 +7,51 @@
 # Conditional build:
 %bcond_without	console_wx		# wx-console program
 %bcond_without	gnome			# gnome-console program
-%bcond_with	sqlite			# use SQLite
 %bcond_without	bat			# bat Qt4 GUI
-%bcond_without	mysql			# use MySQL
+%bcond_without	dbi			# use Database Independent Abstraction Layer (libdbi)
+%bcond_with	mysql			# use MySQL
 %bcond_with	pgsql			# use PostgreSQL
 %bcond_with	python
 %bcond_with	rescue
+%bcond_with	sqlite			# use SQLite
 %bcond_with	sqlite3			# use SQLite3 instead of SQLite 2
 %bcond_with	sqlite3_sync_off	# makes SQLite3 backend much faster, but less reliable
+%if %{with dbi}
+%define		database	dbi
+%undefine       with_mysql
+%undefine       with_pgsql
+%undefine       with_sqlite
+%undefine       with_sqlite3
+%endif
 %if %{with sqlite}
 %define		database	sqlite
+%undefine       with_dbi
 %undefine       with_mysql
 %undefine       with_pgsql
+%undefine       with_sqlite3
 %endif
 %if %{with sqlite3}
 %define		database	sqlite3
-%undefine       with_sqlite
+%undefine       with_dbi
 %undefine       with_mysql
 %undefine       with_pgsql
+%undefine       with_sqlite
 %endif
 %if %{with pgsql}
 %define		database	postgresql
+%undefine       with_dbi
+%undefine       with_mysql
 %undefine       with_sqlite
 %undefine       with_sqlite3
-%undefine       with_mysql
 %endif
 %if %{with mysql}
 %define		database	mysql
+%undefine       with_dbi
+%undefine       with_pgsql
 %undefine       with_sqlite
 %undefine       with_sqlite3
-%undefine       with_pgsql
+%endif
+%if !%{with sqlite3}
 %undefine       with_sqlite3_sync_off
 %endif
 #
@@ -67,9 +82,11 @@
 Patch3:		%{name}-branding.patch
 Patch4:		%{name}-conf.patch
 Patch5:		%{name}-desktop.patch
+Patch6:		%{name}-64bitbuild_fix.patch
 URL:		http://www.bacula.org/
 BuildRequires:	acl-static
 BuildRequires:	automake
+%{?with_dbi:BuildRequires:	libdbi-devel}
 %if %{with rescue}
 BuildRequires:	fakeroot
 %endif
@@ -198,9 +215,7 @@
 maintaining the file indexes and volume databases for all files backed
 up. The Catalog services permit the System Administrator or user to
 quickly locate and restore any desired file, since it maintains a
-record of all Volumes used, all Jobs run, and all Files saved. This
-build requires %{database} to be installed separately as the catalog
-database.
+record of all Volumes used, all Jobs run, and all Files saved.
 
 %description dir -l pl.UTF-8
 Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów.
@@ -214,8 +229,7 @@
 katalogowe umożliwiają administratorowi lub użytkownikowi szybko
 zlokalizować i odtworzyć dowolny plik, ponieważ utrzymują rekord ze
 wszystkimi używanymi wolumenami, uruchomionymi zadaniami i zapisanymi
-plikami. Pakiet wymaga %{database} zainstalowanego oddzielnie jako
-bazy danych dla katalogu.
+plikami.
 
 %package console
 Summary:	Bacula Console
@@ -441,6 +455,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -952,6 +967,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2009/04/21 10:07:34  mmazur
+- nfy; move to libdbi instead of native DB drivers
+
 Revision 1.107  2009/04/17 13:18:14  glen
 - as tray-monitor.conf is world readable, leave bat.conf too, as those gui tools don't really need to be ran as root
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bacula.spec?r1=1.107&r2=1.108&f=u