%if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} || %{rhel5}
%define _dist %(grep Red /etc/redhat-release)
%endif
-%if %{fc1} || %{fc4} || %{fc5} || %{fc6} || %{fc7}
+%if %{fc1} || %{fc4} || %{fc5} || %{fc7}
%define _dist %(grep Fedora /etc/redhat-release)
%endif
%if %{centos5} || %{centos4} || %{centos3}
%if %{fc3} && ! %{rhel4} && ! %{centos4} && ! %{sl4}
%define _dist %(grep Fedora /etc/redhat-release)
%endif
+%if %{fc6} && ! %{rhel5} && ! %{centos5} && ! %{sl5}
+%define _dist %(grep Fedora /etc/redhat-release)
+%endif
%if %{wb3} && ! %{rhel3} && ! %{centos3} && ! %{sl3}
%define _dist %(grep White /etc/whitebox-release)
%endif
%if %{gconsole}
BuildRequires: pkgconfig, pango-devel, atk-devel
%endif
-%if %{bat}
+
+# Rh qt4 packages don't provide, guess what, qt!
+# so fix for broken rh
+%define broken_rh 0
+%if %{rhel5} || %{centos5} || %{sl5} || %{fc5} || %{fc6} || %{fc7}
+%define broken_rh 1"
+%endif
+%if %{bat} && ! %{broken_rh}
BuildRequires: qt-devel >= 4.2
%endif
+%if %{bat} && %{broken_rh}
+BuildRequires: qt4-devel >= 4.2
+%endif
+
%if %{rh7}
BuildRequires: libtermcap-devel
BuildRequires: glibc-devel >= 2.2
Requires: freetype
Requires: libgcc
Requires: libpng
-Requires: qt >= 4.2
+Requires: qt4 >= 4.2
Requires: libstdc++
Requires: zlib
%endif
Requires: freetype
Requires: libgcc
Requires: libpng
-Requires: qt >= 4.2
+Requires: qt4 >= 4.2
Requires: libstdc++
Requires: zlib
%endif
Requires: freetype
Requires: libgcc
Requires: libpng
-Requires: qt >= 4.2
+Requires: qt4 >= 4.2
Requires: libstdc++
Requires: zlib
%endif
export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}"
%endif
+# Red Hat's 64 bit installation of QT4 appears to be broken so:
+%define qt_path 0
+%if %{rhel5} || %{centos5} || %{sl5}
+%define qt_path 1
+%endif
+%if %{bat} && %{qt_path} && %{x86_64}
+export PATH=/usr/lib64/qt4/bin/:$PATH
+export QTDIR=/usr/lib64/qt4/
+export QTINC=/usr/lib64/qt4/include/
+export QTLIB=/usr/lib64/qt4/
+%endif
+
%configure \
--prefix=/usr \
--sbindir=/usr/sbin \
%endif
%changelog
+* Sun Nov 04 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- fix dist defines for rhel5 and clones
+- fix rhel broken 64 bit QT4 paths
+- rh qt4 packages don't provide qt so fix that too
* Mon Oct 29 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>
- correct ownership when creating sqlite db file in post script
* Sun Sep 16 2007 D. Scott Barninger <barninger@fairfieldcomputers.com>