From: Scott Barninger Date: Sat, 8 Nov 2008 14:11:08 +0000 (+0000) Subject: Add use of pkgconfig to find QT4 paths. X-Git-Tag: Release-7.0.0~3757 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=01b351dd6a6f3139909c818b0b40e747d15f1c2a;p=bacula%2Fbacula Add use of pkgconfig to find QT4 paths. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8019 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/platforms/contrib-rpm/build_rpm.sh b/bacula/platforms/contrib-rpm/build_rpm.sh index 9f82f26349..ee0278e9f0 100755 --- a/bacula/platforms/contrib-rpm/build_rpm.sh +++ b/bacula/platforms/contrib-rpm/build_rpm.sh @@ -76,9 +76,11 @@ SAVEUPDATEDB=0 # to override your language shell variable uncomment and edit this # export LANG=en_US.UTF-8 -# if you have a problem getting bat to build try these (needed on Fedora 8/9) -# export QTDIR=/usr/lib/qt4 -# export PATH=/usr/lib/qt4/bin;$PATH +# this is now in the spec file but when building bat on older versions uncomment +#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} # Make no changes below this point without consensus @@ -189,3 +191,4 @@ ls # 12 Jan 2008 add fc8 # 23 May 2008 add fc9 # 28 Jun 2008 add su110 +# 08 Nov 2008 add use of pkgconfig to obtain QT4 paths diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index 1dbf7cfdc4..a28a60f440 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -329,6 +329,9 @@ BuildRequires: python, python-devel %if %{gconsole} BuildRequires: pkgconfig, pango-devel, atk-devel %endif +%if %{bat} +BuildRequires: pkgconfig +%endif # Rh qt4 packages don't have a provide for, guess what, qt! # still broken in fc8, ok in fc9 @@ -1348,6 +1351,13 @@ the client or server packages. export LDFLAGS="${LDFLAGS} -L/usr/lib/termcap" %endif +%if %{bat} +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} +%endif + cwd=${PWD} cd %{depkgs} %if %{sqlite} @@ -2428,6 +2438,8 @@ fi %endif %changelog +* Sat Nov 08 2008 D. Scott Barninger +- set paths for QT using pkgconfig * Sat Oct 11 2008 D. Scott Barninger - release 2.4.3 update depkgs to 11Sep08 remove file nmshack from mtx package * Sun Sep 07 2008 D. Scott Barninger diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index 1dbf7cfdc4..a28a60f440 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -329,6 +329,9 @@ BuildRequires: python, python-devel %if %{gconsole} BuildRequires: pkgconfig, pango-devel, atk-devel %endif +%if %{bat} +BuildRequires: pkgconfig +%endif # Rh qt4 packages don't have a provide for, guess what, qt! # still broken in fc8, ok in fc9 @@ -1348,6 +1351,13 @@ the client or server packages. export LDFLAGS="${LDFLAGS} -L/usr/lib/termcap" %endif +%if %{bat} +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} +%endif + cwd=${PWD} cd %{depkgs} %if %{sqlite} @@ -2428,6 +2438,8 @@ fi %endif %changelog +* Sat Nov 08 2008 D. Scott Barninger +- set paths for QT using pkgconfig * Sat Oct 11 2008 D. Scott Barninger - release 2.4.3 update depkgs to 11Sep08 remove file nmshack from mtx package * Sun Sep 07 2008 D. Scott Barninger diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index 1dbf7cfdc4..a28a60f440 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -329,6 +329,9 @@ BuildRequires: python, python-devel %if %{gconsole} BuildRequires: pkgconfig, pango-devel, atk-devel %endif +%if %{bat} +BuildRequires: pkgconfig +%endif # Rh qt4 packages don't have a provide for, guess what, qt! # still broken in fc8, ok in fc9 @@ -1348,6 +1351,13 @@ the client or server packages. export LDFLAGS="${LDFLAGS} -L/usr/lib/termcap" %endif +%if %{bat} +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} +%endif + cwd=${PWD} cd %{depkgs} %if %{sqlite} @@ -2428,6 +2438,8 @@ fi %endif %changelog +* Sat Nov 08 2008 D. Scott Barninger +- set paths for QT using pkgconfig * Sat Oct 11 2008 D. Scott Barninger - release 2.4.3 update depkgs to 11Sep08 remove file nmshack from mtx package * Sun Sep 07 2008 D. Scott Barninger