From 182195c3ae879439da203dece77efc8cf209e31e Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sun, 14 Mar 2010 14:55:02 -0400 Subject: [PATCH] Allow users to build bat without static QT if desired. --- bacula/platforms/rpm/bacula-bat.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bacula/platforms/rpm/bacula-bat.spec b/bacula/platforms/rpm/bacula-bat.spec index 33a7b45953..f9c8ed8bad 100644 --- a/bacula/platforms/rpm/bacula-bat.spec +++ b/bacula/platforms/rpm/bacula-bat.spec @@ -62,6 +62,9 @@ %{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)} %{expand: %%define gccrel %(rpm -q --queryformat %%{release} gcc)} +%define staticqt 1 +%{?nobuild_staticqt:%define staticqt 0} + # determine what platform we are building on %define fedora 0 %define suse 0 @@ -160,10 +163,12 @@ It is an add-on to the client or server packages. cwd=${PWD} -#export QTDIR=$(pkg-config --variable=prefix QtCore) -#export QTINC=$(pkg-config --variable=includedir QtCore) -#export QTLIB=$(pkg-config --variable=libdir QtCore) -#export PATH=${QTDIR}/bin/:${PATH} +%if ! %{staticqt} +export QTDIR=$(pkg-config --variable=prefix QtCore) +export QTINC=$(pkg-config --variable=includedir QtCore) +export QTLIB=$(pkg-config --variable=libdir QtCore) +export PATH=${QTDIR}/bin/:${PATH} +%else cd %{depkgs_qt} make qt4 < - Fix for QT mkspecs location on FC12 +- allow user to build without embedded static QT * Sat Feb 27 2010 D. Scott Barninger - add dependency on bacula-libs * Sat Feb 13 2010 D. Scott Barninger -- 2.39.5