SPECS: bacula.spec - rel 0.3; builds with dbi as default - there's a chance...

[mmazur]

Author: mmazur                       Date: Wed Apr 22 10:52:41 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 0.3; builds with dbi as default
- there's a chance it actually works
- TODO: the %banner warning

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

---- Diffs:

================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.108 SPECS/bacula.spec:1.109
--- SPECS/bacula.spec:1.108	Tue Apr 21 12:07:34 2009
+++ SPECS/bacula.spec	Wed Apr 22 12:52:36 2009
@@ -59,7 +59,7 @@
 Summary(pl.UTF-8):	Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:		bacula
 Version:	3.0.0
-Release:	0.2
+Release:	0.3
 Epoch:		0
 License:	extended GPL v2
 Group:		Networking/Utilities
@@ -83,6 +83,7 @@
 Patch4:		%{name}-conf.patch
 Patch5:		%{name}-desktop.patch
 Patch6:		%{name}-64bitbuild_fix.patch
+Patch7:		%{name}-dbi_fixes.patch
 URL:		http://www.bacula.org/
 BuildRequires:	acl-static
 BuildRequires:	automake
@@ -456,6 +457,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%{?with_dbi:%patch7 -p1}
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -464,6 +466,10 @@
 	src/cats/grant_* src/cats/make_* src/cats/update_*
 sed -i -e 's/@hostname@/--hostname--/' src/*/*.conf.in
 
+for dbtype in bdb mysql postgresql sqlite3 sqlite; do
+	sed -i -e "s, at DB_TYPE@,$dbtype,g" src/cats/*_${dbtype}_*
+done
+
 %build
 cp -f %{_datadir}/automake/config.sub autoconf
 cd autoconf && %{__aclocal} -I bacula-macros -I gettext-macros && cd ..
@@ -820,7 +826,15 @@
 %{_mandir}/man8/bacula-dir.8*
 %{_mandir}/man8/dbcheck.8*
 %{_libexecdir}/%{name}/query.sql
-%if %{with sqlite3}
+%if %{with bdb} || %{with dbi}
+%attr(755,root,root) %{_libexecdir}/%{name}/create_bdb_database
+%attr(755,root,root) %{_libexecdir}/%{name}/drop_bdb_database
+%attr(755,root,root) %{_libexecdir}/%{name}/drop_bdb_tables
+%attr(755,root,root) %{_libexecdir}/%{name}/grant_bdb_privileges
+%attr(755,root,root) %{_libexecdir}/%{name}/make_bdb_tables
+%attr(755,root,root) %{_libexecdir}/%{name}/update_bdb_*
+%endif
+%if %{with sqlite3} || %{with dbi}
 %attr(755,root,root) %{_libexecdir}/%{name}/create_sqlite3_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_sqlite3_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_sqlite3_tables
@@ -828,7 +842,7 @@
 %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
 %endif
-%if %{with sqlite}
+%if %{with sqlite} || %{with dbi}
 %attr(755,root,root) %{_libexecdir}/%{name}/create_sqlite_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_sqlite_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_sqlite_tables
@@ -836,7 +850,7 @@
 %attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite_*
 %endif
-%if %{with mysql}
+%if %{with mysql} || %{with dbi}
 %attr(755,root,root) %{_libexecdir}/%{name}/create_mysql_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_mysql_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_mysql_tables
@@ -844,20 +858,23 @@
 %attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_mysql_*
 %endif
-%if %{with pgsql}
+%if %{with pgsql} || %{with dbi}
 %attr(755,root,root) %{_libexecdir}/%{name}/create_postgresql_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_postgresql_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_postgresql_*
+%attr(755,root,root) %{_libexecdir}/%{name}/fix_postgresql_*
 %endif
+%if %{without dbi}
 %attr(755,root,root) %{_libexecdir}/%{name}/create_bacula_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_bacula_database
 %attr(755,root,root) %{_libexecdir}/%{name}/drop_bacula_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/grant_bacula_privileges
 %attr(755,root,root) %{_libexecdir}/%{name}/make_bacula_tables
 %attr(755,root,root) %{_libexecdir}/%{name}/update_bacula_tables
+%endif
 %attr(755,root,root) %{_libexecdir}/%{name}/make_catalog_backup
 %attr(755,root,root) %{_libexecdir}/%{name}/delete_catalog_backup
 
@@ -967,6 +984,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2009/04/22 10:52:36  mmazur
+- rel 0.3; builds with dbi as default
+- there's a chance it actually works
+- TODO: the %banner warning
+
 Revision 1.108  2009/04/21 10:07:34  mmazur
 - nfy; move to libdbi instead of native DB drivers
 
================================================================

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