packages: bacula/bacula.spec, bacula/install-cats-no-fail.patch (NEW) - do ...
glen
glen at pld-linux.org
Fri Oct 22 13:17:09 CEST 2010
Author: glen Date: Fri Oct 22 11:17:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- do not install fail because last dbtype is not built
---- Files affected:
packages/bacula:
bacula.spec (1.165 -> 1.166) , install-cats-no-fail.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.165 packages/bacula/bacula.spec:1.166
--- packages/bacula/bacula.spec:1.165 Fri Oct 22 13:16:25 2010
+++ packages/bacula/bacula.spec Fri Oct 22 13:17:04 2010
@@ -59,6 +59,7 @@
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
@@ -475,6 +476,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
@@ -1065,6 +1067,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.166 2010/10/22 11:17:04 glen
+- do not install fail because last dbtype is not built
+
Revision 1.165 2010/10/22 11:16:25 glen
- license AGPL v3
================================================================
Index: packages/bacula/install-cats-no-fail.patch
diff -u /dev/null packages/bacula/install-cats-no-fail.patch:1.1
--- /dev/null Fri Oct 22 13:17:10 2010
+++ packages/bacula/install-cats-no-fail.patch Fri Oct 22 13:17:04 2010
@@ -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 <glen at delfi.ee>
+--- 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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.165&r2=1.166&f=u
More information about the pld-cvs-commit
mailing list