# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346267245 -7200 # Node ID f4280ba8b3ac2b6e7b189ecc3d9b4b13d50fdbe0 # Parent c44c510c1c7fae9d3814935f73c4fc4fb78e7043 Correct flawed build condition assuming no preinstalled overriding bacula libs. diff -r c44c510c1c7f -r f4280ba8b3ac bacula/bacula.spec --- a/bacula/bacula.spec Wed Aug 29 21:07:12 2012 +0200 +++ b/bacula/bacula.spec Wed Aug 29 21:07:25 2012 +0200 @@ -21,14 +21,9 @@ ## SUCH DAMAGE. ## -# MSvB: # MSvB: Note, see http://www.bacula.org/en/?page=news # MSvB: for information on new configuration options. -# MSvB: Warning! -L /pfx/lib is placed before locally -# MSvB: built libraries (bacula-/src/cats...) -# MSvB: which causes the old version of bacula to -# MSvB: supply logic to the new version build! -# MSvB: + # package information Name: bacula @@ -124,6 +119,16 @@ %setup -q %patch -p0 rm -f src/lib/tcpd.h + %{l_shtool} subst \ + -e 's;\( *\$(LDFLAGS)\)\(.*-L\.\.\/findlib\);\2\1;g' \ + -e 's;\( *\$(LDFLAGS)\)\(.*-L\.\.\/cats\);\2\1;g' \ + -e 's;\( *\$(LDFLAGS)\)\(.*-L\.\.\/lib\);\2\1;g' \ + src/stored/Makefile.in \ + src/console/Makefile.in \ + src/dird/Makefile.in \ + src/filed/Makefile.in \ + src/tools/Makefile.in \ + src/tray-monitor/Makefile.in \ %build # generate a random director password