From 60051af760331c5536372f47287394bb609df76b Mon Sep 17 00:00:00 2001 From: Scott Barninger Date: Sun, 4 Nov 2007 16:16:47 +0000 Subject: [PATCH] - fix dist defines for rhel5 and clones - fix rhel broken 64 bit QT4 paths git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5845 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/platforms/mandrake/bacula.spec.in | 20 +++++++++++++++++++- bacula/platforms/redhat/bacula.spec.in | 20 +++++++++++++++++++- bacula/platforms/suse/bacula.spec.in | 20 +++++++++++++++++++- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in index fd176ac91a..a1b6341a6c 100644 --- a/bacula/platforms/mandrake/bacula.spec.in +++ b/bacula/platforms/mandrake/bacula.spec.in @@ -198,7 +198,7 @@ exit 1 %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} @@ -210,6 +210,9 @@ exit 1 %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 @@ -1103,6 +1106,18 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/mysql" 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 \ @@ -2024,6 +2039,9 @@ fi %endif %changelog +* Sun Nov 04 2007 D. Scott Barninger +- fix dist defines for rhel5 and clones +- fix rhel broken 64 bit QT4 paths * 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 fd176ac91a..a1b6341a6c 100644 --- a/bacula/platforms/redhat/bacula.spec.in +++ b/bacula/platforms/redhat/bacula.spec.in @@ -198,7 +198,7 @@ exit 1 %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} @@ -210,6 +210,9 @@ exit 1 %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 @@ -1103,6 +1106,18 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/mysql" 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 \ @@ -2024,6 +2039,9 @@ fi %endif %changelog +* Sun Nov 04 2007 D. Scott Barninger +- fix dist defines for rhel5 and clones +- fix rhel broken 64 bit QT4 paths * 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 fd176ac91a..a1b6341a6c 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -198,7 +198,7 @@ exit 1 %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} @@ -210,6 +210,9 @@ exit 1 %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 @@ -1103,6 +1106,18 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/mysql" 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 \ @@ -2024,6 +2039,9 @@ fi %endif %changelog +* Sun Nov 04 2007 D. Scott Barninger +- fix dist defines for rhel5 and clones +- fix rhel broken 64 bit QT4 paths * Mon Oct 29 2007 D. Scott Barninger - correct ownership when creating sqlite db file in post script * Sun Sep 16 2007 D. Scott Barninger -- 2.39.5