From: Scott Barninger Date: Sun, 4 Nov 2007 17:28:01 +0000 (+0000) Subject: rh qt4 packages don't provide qt so fix that too X-Git-Tag: Release-7.0.0~5450 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5e42cd1bce2fe6103c1d56b4fb226fd15b51941a;p=bacula%2Fbacula rh qt4 packages don't provide qt so fix that too git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5850 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index a1b6341a6c..4e67593ca1 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -286,9 +286,20 @@ BuildRequires: python, python-devel %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 @@ -995,7 +1006,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1007,7 +1018,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1019,7 +1030,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -2042,6 +2053,7 @@ fi * Sun Nov 04 2007 D. Scott Barninger - 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 - correct ownership when creating sqlite db file in post script * Sun Sep 16 2007 D. Scott Barninger diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in index a1b6341a6c..4e67593ca1 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -286,9 +286,20 @@ BuildRequires: python, python-devel %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 @@ -995,7 +1006,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1007,7 +1018,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1019,7 +1030,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -2042,6 +2053,7 @@ fi * Sun Nov 04 2007 D. Scott Barninger - 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 - correct ownership when creating sqlite db file in post script * Sun Sep 16 2007 D. Scott Barninger diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index a1b6341a6c..4e67593ca1 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -286,9 +286,20 @@ BuildRequires: python, python-devel %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 @@ -995,7 +1006,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1007,7 +1018,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -1019,7 +1030,7 @@ Requires: fontconfig Requires: freetype Requires: libgcc Requires: libpng -Requires: qt >= 4.2 +Requires: qt4 >= 4.2 Requires: libstdc++ Requires: zlib %endif @@ -2042,6 +2053,7 @@ fi * Sun Nov 04 2007 D. Scott Barninger - 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 - correct ownership when creating sqlite db file in post script * Sun Sep 16 2007 D. Scott Barninger