Fix for qt mkspecs location on Fedora 12.

[bacula/bacula] / bacula / platforms / rpm / bacula-bat.spec

diff --git a/bacula/platforms/rpm/bacula-bat.spec b/bacula/platforms/rpm/bacula-bat.spec
index f8998c52ec3504c01bddd2cac40b965dbca95ef7..33a7b4595321ab0d4509166ba85760bd8e62ee77 100644 (file)
--- 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
@@ -55,6 +59,9 @@
 
 %{?contrib_packager:%define _packager %{contrib_packager}}
 
+%{expand: %%define gccver %(rpm -q --queryformat %%{version} gcc)}
+%{expand: %%define gccrel %(rpm -q --queryformat %%{release} gcc)}
+
 # determine what platform we are building on
 %define fedora 0
 %define suse 0
@@ -93,6 +100,27 @@ Distribution: %{_dist}
 Source0: http://www.prdownloads.sourceforge.net/bacula/bacula-%{version}.tar.gz
 Source1: http://www.prdownloads.sourceforge.net/bacula/depkgs-qt-%{depkgs_qt_version}.tar.gz
 
+BuildRequires: gcc, gcc-c++, make, autoconf
+BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, zlib-devel
+BuildRequires: openssl-devel, fontconfig-devel, libpng-devel, libstdc++-devel, zlib-devel
+
+Requires: openssl
+Requires: fontconfig
+Requires: libgcc
+Requires: libpng
+Requires: libstdc++
+Requires: zlib
+Requires: bacula-libs
+
+%if %{suse}
+Requires: /usr/bin/kdesu
+Requires: freetype2
+BuildRequires: freetype2-devel
+%else
+Requires: usermode
+Requires: freetype
+BuildRequires: freetype-devel
+%endif
 
 # Source directory locations
 %define depkgs_qt ../depkgs-qt
@@ -145,6 +173,7 @@ 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}
 
 # Main Bacula configuration with bat
@@ -197,7 +226,7 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc/bacula
 %if %{suse}
 cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png
 cp -p scripts/bat.desktop.xsu $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
-touch RPM_BUILD_ROOT%{sysconfdir}/bat.kdesu
+touch $RPM_BUILD_ROOT%{sysconf_dir}/bat.kdesu
 %else
 cp -p src/qt-console/images/bat_icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/bat_icon.png
 cp -p scripts/bat.desktop.consolehelper $RPM_BUILD_ROOT/usr/share/applications/bat.desktop
@@ -267,8 +296,13 @@ 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
+* 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
 * Sat Jan 30 2010 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - fix consolehelper/xsu for suse packages
 * Sat Aug 1 2009 Kern Sibbald <kern@sibbald.com>