From 3f552793be638bdcd8b29f34dd3d2b9092547757 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 22 Oct 2010 11:17:04 +0000 Subject: [PATCH] - do not install fail because last dbtype is not built Changed files: bacula.spec -> 1.166 install-cats-no-fail.patch -> 1.1 --- bacula.spec | 2 ++ install-cats-no-fail.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 install-cats-no-fail.patch diff --git a/bacula.spec b/bacula.spec index fc333df..09f0d1c 100644 --- a/bacula.spec +++ b/bacula.spec @@ -58,6 +58,7 @@ Patch8: %{name}-dbi_dbcheck.patch Patch9: %{name}-openssl1.patch Patch10: %{name}-dvd_rewind.patch Patch11: qmake-bin.patch +Patch12: install-cats-no-fail.patch URL: http://www.bacula.org/ BuildRequires: acl-devel BuildRequires: autoconf @@ -474,6 +475,7 @@ Nagios plugin to check bacula. %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue diff --git a/install-cats-no-fail.patch b/install-cats-no-fail.patch new file mode 100644 index 0000000..2f22127 --- /dev/null +++ b/install-cats-no-fail.patch @@ -0,0 +1,26 @@ +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.44.0