From abbc160c0e7720db899e2c35b368cf4bad4ff1d6 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 7 Feb 2018 13:53:02 +0100 Subject: [PATCH] Return support of Qt4 for older releases --- bacula.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/bacula.spec b/bacula.spec index 6f9227e..20a9065 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 9.0.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -64,7 +64,11 @@ BuildRequires: lzo-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: postgresql-devel +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 BuildRequires: qt5-devel +%else +BuildRequires: qt4-devel >= 4.6.2 +%endif BuildRequires: readline-devel BuildRequires: sqlite-devel BuildRequires: zlib-devel @@ -335,7 +339,11 @@ find updatedb -type f | xargs chmod -x %build export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses" export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses" +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 export PATH="$PATH:%{_qt5_bindir}" +%else +export PATH="$PATH:%{_qt4_bindir}" +%endif %configure \ --disable-conio \ --disable-rpath \ @@ -382,7 +390,11 @@ make %{?_smp_mflags} make -C examples/nagios/check_bacula pushd src/qt-console/tray-monitor +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 %{?qmake_qt5}%{!?qmake_qt5:qmake-qt5} tray-monitor.pro +%else + %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro +%endif make %{?_smp_mflags} cp -f .libs/bacula-tray-monitor . popd @@ -580,7 +592,9 @@ fi %{_libdir}/libbaccfg-%{version}.so %{_libdir}/libbacfind-%{version}.so %{_libdir}/libbacsd-%{version}.so +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 %{_libdir}/libbaccats-%{version}.so +%endif %files libs-sql %{_libdir}/libbaccats-mysql-%{version}.so @@ -733,6 +747,9 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Wed Feb 07 2018 Josef Ridky - 9.0.6-8 +- Return support of Qt4 for older releases + * Wed Feb 07 2018 Fedora Release Engineering - 9.0.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild