diff --git a/bacula.spec b/bacula.spec index 4a0d128..acaae9d 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 9.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -70,24 +70,21 @@ BuildRequires: readline-devel BuildRequires: sqlite-devel BuildRequires: zlib-devel -# https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules -%if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: perl-interpreter -%else -BuildRequires: perl -%endif - %if 0%{?fedora} || 0%{?rhel} >= 7 +BuildRequires: qt5-qtbase-devel BuildRequires: systemd +%else +BuildRequires: qt4-devel >= 4.6.2 %endif %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: mariadb-connector-c-devel -BuildRequires: qt5-devel +# https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules +BuildRequires: perl-interpreter %else BuildRequires: mysql-devel +BuildRequires: perl BuildRequires: tcp_wrappers-devel -BuildRequires: qt4-devel >= 4.6.2 %endif %if 0%{?fedora} >= 30 @@ -339,7 +336,7 @@ 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} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 export PATH="$PATH:%{_qt5_bindir}" %else export PATH="$PATH:%{_qt4_bindir}" @@ -392,7 +389,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_build -C examples/nagios/check_bacula pushd src/qt-console/tray-monitor -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %{?qmake_qt5}%{!?qmake_qt5:qmake-qt5} tray-monitor.pro %else %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro @@ -417,7 +414,7 @@ rm -f %{buildroot}%{_libdir}/libbaccats.so # Bat install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png install -p -m 644 -D scripts/bat.desktop %{buildroot}%{_datadir}/applications/bat.desktop -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 # ? install -p -m 755 -D src/qt-console/.libs/bat %{buildroot}%{_sbindir}/bat %endif @@ -752,6 +749,10 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Sun Jan 13 2019 Simone Caronni - 9.4.1-3 +- Build QT programs with QT 5 on RHEL/CentOS 7. Also, reduce the number of + required QT packages for building. + * Sun Jan 13 2019 Simone Caronni - 9.4.1-2 - Add Debian patch to enable/disable S3 support at configure time. - Disable S3 as it does not currently build: