Return support of Qt4 for older releases

This commit is contained in:
Josef Ridky 2018-02-07 13:53:02 +01:00
parent f7e839c1f1
commit abbc160c0e

View File

@ -3,7 +3,7 @@
Name: bacula Name: bacula
Version: 9.0.6 Version: 9.0.6
Release: 7%{?dist} Release: 8%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details # See LICENSE for details
License: AGPLv3 with exceptions License: AGPLv3 with exceptions
@ -64,7 +64,11 @@ BuildRequires: lzo-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
%if 0%{?fedora} > 27 || 0%{?rhel} > 7
BuildRequires: qt5-devel BuildRequires: qt5-devel
%else
BuildRequires: qt4-devel >= 4.6.2
%endif
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -335,7 +339,11 @@ find updatedb -type f | xargs chmod -x
%build %build
export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses" export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
export CPPFLAGS="$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}" export PATH="$PATH:%{_qt5_bindir}"
%else
export PATH="$PATH:%{_qt4_bindir}"
%endif
%configure \ %configure \
--disable-conio \ --disable-conio \
--disable-rpath \ --disable-rpath \
@ -382,7 +390,11 @@ make %{?_smp_mflags}
make -C examples/nagios/check_bacula make -C examples/nagios/check_bacula
pushd src/qt-console/tray-monitor pushd src/qt-console/tray-monitor
%if 0%{?fedora} > 27 || 0%{?rhel} > 7
%{?qmake_qt5}%{!?qmake_qt5:qmake-qt5} tray-monitor.pro %{?qmake_qt5}%{!?qmake_qt5:qmake-qt5} tray-monitor.pro
%else
%{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro
%endif
make %{?_smp_mflags} make %{?_smp_mflags}
cp -f .libs/bacula-tray-monitor . cp -f .libs/bacula-tray-monitor .
popd popd
@ -580,7 +592,9 @@ fi
%{_libdir}/libbaccfg-%{version}.so %{_libdir}/libbaccfg-%{version}.so
%{_libdir}/libbacfind-%{version}.so %{_libdir}/libbacfind-%{version}.so
%{_libdir}/libbacsd-%{version}.so %{_libdir}/libbacsd-%{version}.so
%if 0%{?fedora} > 27 || 0%{?rhel} > 7
%{_libdir}/libbaccats-%{version}.so %{_libdir}/libbaccats-%{version}.so
%endif
%files libs-sql %files libs-sql
%{_libdir}/libbaccats-mysql-%{version}.so %{_libdir}/libbaccats-mysql-%{version}.so
@ -733,6 +747,9 @@ fi
%{_libdir}/nagios/plugins/check_bacula %{_libdir}/nagios/plugins/check_bacula
%changelog %changelog
* Wed Feb 07 2018 Josef Ridky <jridky@redhat.com> - 9.0.6-8
- Return support of Qt4 for older releases
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.6-7 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild