From aeddadecac07238dffe0a3a3b57552d53cd932b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 8 Dec 2010 19:32:46 +0000 Subject: [PATCH] - merge install-cats-no-fail.patch into bacula-dbi_fixes.patch, as seems the bug was created by our own patch Changed files: bacula-dbi_fixes.patch -> 1.3 bacula.spec -> 1.176 install-cats-no-fail.patch -> 1.2 --- bacula-dbi_fixes.patch | 12 ++++++------ bacula.spec | 2 -- install-cats-no-fail.patch | 26 -------------------------- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 install-cats-no-fail.patch diff --git a/bacula-dbi_fixes.patch b/bacula-dbi_fixes.patch index e049ecb..e320916 100644 --- a/bacula-dbi_fixes.patch +++ b/bacula-dbi_fixes.patch @@ -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 diff --git a/bacula.spec b/bacula.spec index 0b7ecf3..50713ee 100644 --- a/bacula.spec +++ b/bacula.spec @@ -54,7 +54,6 @@ Patch8: %{name}-dbi_dbcheck.patch 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 @@ -472,7 +471,6 @@ Nagios plugin to check bacula. %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %patch13 -p1 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue diff --git a/install-cats-no-fail.patch b/install-cats-no-fail.patch deleted file mode 100644 index 2f22127..0000000 --- a/install-cats-no-fail.patch +++ /dev/null @@ -1,26 +0,0 @@ -do not let missing sqlite build make install for cycle to abort script with error - -fix is to invert the condition to be get hit by "set -e" exit on error - -Author: Elan Ruusamäe ---- bacula-5.0.3/src/cats/Makefile.in~ 2010-10-22 14:00:55.000000000 +0300 -+++ bacula-5.0.3/src/cats/Makefile.in 2010-10-22 14:00:57.433667998 +0300 -@@ -133,12 +133,12 @@ - - install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@ - 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 -- 2.43.0