completly disable 'lockmgr'

It is supposed to be used only for debugging and when partially
enabled, like it was, it breaks tray-monitor

diff --git a/bacula-no_lockmgr.patch b/bacula-no_lockmgr.patch
new file mode 100644 (file)
index 0000000..075a1d0
--- /dev/null
+++ b/bacula-no_lockmgr.patch
@@ -0,0 +1,16 @@
+diff -dur bacula-5.2.13.orig/src/version.h bacula-5.2.13/src/version.h
+--- bacula-5.2.13.orig/src/version.h   2013-02-19 20:21:35.000000000 +0100
++++ bacula-5.2.13/src/version.h        2013-12-04 20:36:09.987318325 +0100
+@@ -77,9 +77,9 @@
+  *   it can always be turned on, but we advise to use it only
+  *   for debug
+  */
+-# ifndef _USE_LOCKMGR
+-#  define _USE_LOCKMGR
+-# endif /* _USE_LOCKMGR */
++//# ifndef _USE_LOCKMGR
++//#  define _USE_LOCKMGR
++//# endif /* _USE_LOCKMGR */
+ /*
+  * Enable priority management with the lock manager
+  *

diff --git a/bacula.spec b/bacula.spec
index 1e09d046e5e41b59eddb9e635a598076c8fd4a26..e09c878b2b3f0ae8b5dad22cb337fc4587e4a2ce 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -57,6 +57,7 @@ Patch2:               %{name}-conf.patch
 Patch3:                %{name}-desktop.patch
 Patch4:                make_catalog_backup-setup-home.patch
 Patch5:                %{name}-wx-console-build.patch
+Patch6:                %{name}-no_lockmgr.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -462,6 +463,7 @@ Nagios plugin to check bacula.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue