# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346267232 -7200 # Node ID c44c510c1c7fae9d3814935f73c4fc4fb78e7043 # Parent a7ff29d495a482ee79be7d833154a881001cd06f Back out libexec substitution now longer correct, remove manpages correspoding to not installed binaries, and most importantly avoid linking to cats_dummy which serves no other purpose than to sabotage runtime operations of all binaries calling db_init_database(3) with a fatal error message 'Please replace this dummy libbaccats library with a proper one.' Disabling libtool use resolves this problem in the build configuration (probably in src/cats/Makefile.in.) diff -r a7ff29d495a4 -r c44c510c1c7f bacula/bacula.patch --- a/bacula/bacula.patch Wed Aug 29 21:06:55 2012 +0200 +++ b/bacula/bacula.patch Wed Aug 29 21:07:12 2012 +0200 @@ -36,15 +36,15 @@ diff -Nau scripts/bacula.in.orig scripts/bacula.in --- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200 +++ scripts/bacula.in 2010-12-19 19:30:06.000000000 +0100 -@@ -13,37 +13,43 @@ - # easier to "steal" this code for the development +@@ -14,36 +14,43 @@ # environment where they are different. # --SCRIPTDIR=@scriptdir@ -+SCRIPTDIR=@libexecdir@ - # + SCRIPTDIR=@scriptdir@ +-# ++ # Disable Glibc malloc checks, it doesn't help and it keeps from getting # good dumps ++# MALLOC_CHECK_=0 export MALLOC_CHECK_ diff -r a7ff29d495a4 -r c44c510c1c7f bacula/bacula.spec --- a/bacula/bacula.spec Wed Aug 29 21:06:55 2012 +0200 +++ b/bacula/bacula.spec Wed Aug 29 21:07:12 2012 +0200 @@ -201,7 +201,7 @@ --with-subsys-dir=%{l_prefix}/var/bacula/run/subsys \ --with-archivedir=/tmp \ --with-sbin-perm=0755 \ - --disable-shared \ + --disable-libtool \ --disable-nls # build @@ -235,6 +235,9 @@ rm -f $unwanted done ) || exit $? + ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1 + rm -f bacula-bwxconsole.1 bacula-tray-monitor.1 bat.1 + ) || exit $? # install additional files %{l_shtool} install -c -m 754 %{l_value -s -a} \