X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fplatforms%2Frpm%2Fbacula-bat.spec;h=f9bfb6015977f716b64b9d1932c50aa612cf21f6;hb=f8367a79fbe5292158ad0fcfe3ef312fc79c951c;hp=bb88310c66445c9a257792db9a8b75aeea6936d7;hpb=45bb3d41e3279c49f6110ac4e169130cad672e18;p=bacula%2Fbacula

diff --git a/bacula/platforms/rpm/bacula-bat.spec b/bacula/platforms/rpm/bacula-bat.spec
index bb88310c66..f9bfb60159 100644
--- a/bacula/platforms/rpm/bacula-bat.spec
+++ b/bacula/platforms/rpm/bacula-bat.spec
@@ -6,8 +6,12 @@
 
 # basic defines for every build
 %define _release           1
-%define _version           5.0.0
+%define _version           5.0.1
 %define depkgs_qt_version  28Jul09
+
+# this is the QT version in depkgs_qt
+%define qt4ver             4.3.4
+
 %define _packager D. Scott Barninger <barninger@fairfieldcomputers.com>
 
 %define manpage_ext gz
@@ -58,22 +62,25 @@
 %{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
 %define mdk 0
 
 %if %{_vendor} == redhat
-	%define fedora 1
-	%define _dist %(cat /etc/redhat-release)
+        %define fedora 1
+        %define _dist %(cat /etc/redhat-release)
 %endif
 %if %{_vendor} == suse
-	%define suse 1
-	%define _dist %(grep -i SuSE /etc/SuSE-release)
+        %define suse 1
+        %define _dist %(grep -i SuSE /etc/SuSE-release)
 %endif
 %if %{_vendor} == Mandriva
-	%define mdk 1
-	%define _dist %(grep Mand /etc/mandrake-release)
+        %define mdk 1
+        %define _dist %(grep Mand /etc/mandrake-release)
 %endif
 %if ! %{fedora} && ! %{suse} && ! %{mdk}
 %{error: Unknown platform. Please examine the spec file.}
@@ -102,11 +109,11 @@ BuildRequires: openssl-devel, fontconfig-devel, libpng-devel, libstdc++-devel, z
 
 Requires: openssl
 Requires: fontconfig
-Requires: freetype2
 Requires: libgcc
 Requires: libpng
 Requires: libstdc++
 Requires: zlib
+Requires: bacula-libs
 
 %if %{suse}
 Requires: /usr/bin/kdesu
@@ -122,7 +129,7 @@ BuildRequires: freetype-devel
 %define depkgs_qt ../depkgs-qt
 
 # define the basic package description
-%define blurb Bacula - It comes by night and sucks the vital essence from your computers.
+%define blurb Bacula - The Leading Open Source Backup Solution.
 %define blurb2 Bacula is a set of computer programs that permit you (or the system
 %define blurb3 administrator) to manage backup, recovery, and verification of computer
 %define blurb4 data across a network of computers of different kinds. In technical terms,
@@ -156,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 <<EOF
 yes
@@ -169,7 +178,9 @@ export PATH=${qtdir}/qt4/bin:$PATH
 export QTDIR=${qtdir}/qt4/
 export QTINC=${qtdir}/qt4/include/
 export QTLIB=${qtdir}/qt4/lib/
+export QMAKESPEC=${qtdir}/qt-x11-opensource-src-%{qt4ver}/mkspecs/linux-g++/
 cd ${cwd}
+%endif
 
 # Main Bacula configuration with bat
 %configure \
@@ -291,6 +302,11 @@ fi
 rm -rf $RPM_BUILD_DIR/depkgs-qt
 
 %changelog
+* Sun Mar 14 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- Fix for QT mkspecs location on FC12
+- allow user to build without embedded static QT
+* Sat Feb 27 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add dependency on bacula-libs
 * Sat Feb 13 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - create file to allow bat to run nonroot with kdesu
 - add dependency information