packages: bacula/bacula-dbi_fixes.patch, bacula/bacula.spec, bacula/install...

[glen]

Author: glen                         Date: Wed Dec  8 19:32:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge install-cats-no-fail.patch into bacula-dbi_fixes.patch, as seems the bug was created by our own patch

---- Files affected:
packages/bacula:
   bacula-dbi_fixes.patch (1.2 -> 1.3) , bacula.spec (1.175 -> 1.176) , install-cats-no-fail.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/bacula/bacula-dbi_fixes.patch
diff -u packages/bacula/bacula-dbi_fixes.patch:1.2 packages/bacula/bacula-dbi_fixes.patch:1.3
--- packages/bacula/bacula-dbi_fixes.patch:1.2	Tue Mar 16 15:12:36 2010
+++ packages/bacula/bacula-dbi_fixes.patch	Wed Dec  8 20:32:46 2010
@@ -31,12 +31,12 @@
 -	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
 -	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database
 +	for dbtype in bdb mysql postgresql sqlite3 sqlite; do \
-+		[ -f create_$${dbtype}_database ] && $(INSTALL_SCRIPT) create_$${dbtype}_database $(DESTDIR)$(scriptdir)/create_$${dbtype}_database; \
-+		[ -f update_$${dbtype}_tables ] && $(INSTALL_SCRIPT) update_$${dbtype}_tables $(DESTDIR)$(scriptdir)/update_$${dbtype}_tables; \
-+		[ -f make_$${dbtype}_tables ] && $(INSTALL_SCRIPT) make_$${dbtype}_tables $(DESTDIR)$(scriptdir)/make_$${dbtype}_tables; \
-+		[ -f grant_$${dbtype}_privileges ] && $(INSTALL_SCRIPT) grant_$${dbtype}_privileges $(DESTDIR)$(scriptdir)/grant_$${dbtype}_privileges; \
-+		[ -f drop_$${dbtype}_tables ] && $(INSTALL_SCRIPT) drop_$${dbtype}_tables $(DESTDIR)$(scriptdir)/drop_$${dbtype}_tables; \
-+		[ -f drop_$${dbtype}_database ] && $(INSTALL_SCRIPT) drop_$${dbtype}_database $(DESTDIR)$(scriptdir)/drop_$${dbtype}_database; \
++		[ ! -f create_$${dbtype}_database ] || $(INSTALL_SCRIPT) create_$${dbtype}_database $(DESTDIR)$(scriptdir)/create_$${dbtype}_database; \
++		[ ! -f update_$${dbtype}_tables ] || $(INSTALL_SCRIPT) update_$${dbtype}_tables $(DESTDIR)$(scriptdir)/update_$${dbtype}_tables; \
++		[ ! -f make_$${dbtype}_tables ] || $(INSTALL_SCRIPT) make_$${dbtype}_tables $(DESTDIR)$(scriptdir)/make_$${dbtype}_tables; \
++		[ ! -f grant_$${dbtype}_privileges ] || $(INSTALL_SCRIPT) grant_$${dbtype}_privileges $(DESTDIR)$(scriptdir)/grant_$${dbtype}_privileges; \
++		[ ! -f drop_$${dbtype}_tables ] || $(INSTALL_SCRIPT) drop_$${dbtype}_tables $(DESTDIR)$(scriptdir)/drop_$${dbtype}_tables; \
++		[ ! -f drop_$${dbtype}_database ] || $(INSTALL_SCRIPT) drop_$${dbtype}_database $(DESTDIR)$(scriptdir)/drop_$${dbtype}_database; \
 +	done
 +
 +		$(INSTALL_SCRIPT) fix_postgresql_tables $(DESTDIR)$(scriptdir)/fix_postgresql_tables

================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.175 packages/bacula/bacula.spec:1.176
--- packages/bacula/bacula.spec:1.175	Wed Dec  8 19:07:40 2010
+++ packages/bacula/bacula.spec	Wed Dec  8 20:32:46 2010
@@ -55,7 +55,6 @@
 Patch9:		%{name}-openssl1.patch
 Patch10:	%{name}-dvd_rewind.patch
 Patch11:	qmake-bin.patch
-Patch12:	install-cats-no-fail.patch
 Patch13:	make_catalog_backup-setup-home.patch
 URL:		http://www.bacula.org/
 BuildRequires:	acl-devel
@@ -473,7 +472,6 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch13 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
@@ -1071,6 +1069,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2010/12/08 19:32:46  glen
+- merge install-cats-no-fail.patch into bacula-dbi_fixes.patch, as seems the bug was created by our own patch
+
 Revision 1.175  2010/12/08 18:07:40  glen
 - fix bat trigger errors when bat itself not present
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-dbi_fixes.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.175&r2=1.176&f=u