Correct flawed build condition assuming no preinstalled overriding bacula libs.

Wed, 29 Aug 2012 21:07:25 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 29 Aug 2012 21:07:25 +0200
changeset 650
f4280ba8b3ac
parent 649
c44c510c1c7f
child 651
0c602c0042b6

Correct flawed build condition assuming no preinstalled overriding bacula libs.

bacula/bacula.spec file | annotate | diff | comparison | revisions
     1.1 --- a/bacula/bacula.spec	Wed Aug 29 21:07:12 2012 +0200
     1.2 +++ b/bacula/bacula.spec	Wed Aug 29 21:07:25 2012 +0200
     1.3 @@ -21,14 +21,9 @@
     1.4  ##  SUCH DAMAGE.
     1.5  ##
     1.6  
     1.7 -# MSvB:
     1.8  # MSvB: Note, see http://www.bacula.org/en/?page=news
     1.9  # MSvB: for information on new configuration options.
    1.10 -# MSvB: Warning! -L /pfx/lib is placed before locally
    1.11 -# MSvB: built libraries (bacula-<ver>/src/cats...)
    1.12 -# MSvB: which causes the old version of bacula to
    1.13 -# MSvB: supply logic to the new version build!
    1.14 -# MSvB:
    1.15 +
    1.16  
    1.17  #   package information
    1.18  Name:         bacula
    1.19 @@ -124,6 +119,16 @@
    1.20      %setup -q
    1.21      %patch -p0
    1.22      rm -f src/lib/tcpd.h
    1.23 +    %{l_shtool} subst \
    1.24 +        -e 's;\( *\$(LDFLAGS)\)\(.*-L\.\.\/findlib\);\2\1;g' \
    1.25 +        -e 's;\( *\$(LDFLAGS)\)\(.*-L\.\.\/cats\);\2\1;g' \
    1.26 +        -e 's;\( *\$(LDFLAGS)\)\(.*-L\.\.\/lib\);\2\1;g' \
    1.27 +        src/stored/Makefile.in \
    1.28 +        src/console/Makefile.in \
    1.29 +        src/dird/Makefile.in \
    1.30 +        src/filed/Makefile.in \
    1.31 +        src/tools/Makefile.in \
    1.32 +        src/tray-monitor/Makefile.in \
    1.33  
    1.34  %build
    1.35      #   generate a random director password

mercurial