Wed, 29 Aug 2012 21:07:12 +0200
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.)
bacula/bacula.patch | file | annotate | diff | comparison | revisions | |
bacula/bacula.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/bacula/bacula.patch Wed Aug 29 21:06:55 2012 +0200 1.2 +++ b/bacula/bacula.patch Wed Aug 29 21:07:12 2012 +0200 1.3 @@ -36,15 +36,15 @@ 1.4 diff -Nau scripts/bacula.in.orig scripts/bacula.in 1.5 --- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200 1.6 +++ scripts/bacula.in 2010-12-19 19:30:06.000000000 +0100 1.7 -@@ -13,37 +13,43 @@ 1.8 - # easier to "steal" this code for the development 1.9 +@@ -14,36 +14,43 @@ 1.10 # environment where they are different. 1.11 # 1.12 --SCRIPTDIR=@scriptdir@ 1.13 -+SCRIPTDIR=@libexecdir@ 1.14 - # 1.15 + SCRIPTDIR=@scriptdir@ 1.16 +-# 1.17 ++ 1.18 # Disable Glibc malloc checks, it doesn't help and it keeps from getting 1.19 # good dumps 1.20 ++# 1.21 MALLOC_CHECK_=0 1.22 export MALLOC_CHECK_ 1.23
2.1 --- a/bacula/bacula.spec Wed Aug 29 21:06:55 2012 +0200 2.2 +++ b/bacula/bacula.spec Wed Aug 29 21:07:12 2012 +0200 2.3 @@ -201,7 +201,7 @@ 2.4 --with-subsys-dir=%{l_prefix}/var/bacula/run/subsys \ 2.5 --with-archivedir=/tmp \ 2.6 --with-sbin-perm=0755 \ 2.7 - --disable-shared \ 2.8 + --disable-libtool \ 2.9 --disable-nls 2.10 2.11 # build 2.12 @@ -235,6 +235,9 @@ 2.13 rm -f $unwanted 2.14 done 2.15 ) || exit $? 2.16 + ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1 2.17 + rm -f bacula-bwxconsole.1 bacula-tray-monitor.1 bat.1 2.18 + ) || exit $? 2.19 2.20 # install additional files 2.21 %{l_shtool} install -c -m 754 %{l_value -s -a} \