From f02285673ffed7d02908f7793d088dbe1d522c15 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 20 Jul 2017 17:26:03 +0200 Subject: [PATCH] Fix build on Fedora 27 and RHEL 7 --- bacula.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/bacula.spec b/bacula.spec index a1842f2..813e633 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 9.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -36,6 +36,7 @@ Patch5: %{name}-9.0.0-seg-fault.patch Patch6: %{name}-5.2.13-logwatch.patch Patch7: %{name}-9.0.0-non-free-code.patch Patch8: %{name}-9.0.0-tray-monitor-desktop.patch +Patch9: %{name}-9.0.1-mariadb-reconnect.patch # Original patch removed by mistake, upstream is not willing to add it again: # http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a @@ -45,7 +46,6 @@ Patch8: %{name}-9.0.0-tray-monitor-desktop.patch Patch10: %{name}-7.0.4-autoconf.patch BuildRequires: desktop-file-utils -BuildRequires: perl-interpreter BuildRequires: perl-generators BuildRequires: sed @@ -67,6 +67,13 @@ BuildRequires: sqlite-devel BuildRequires: tcp_wrappers-devel BuildRequires: zlib-devel +# https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: perl-interpreter +%else +BuildRequires: perl +%endif + %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 BuildRequires: compat-openssl10-devel %else @@ -312,7 +319,7 @@ Provides check_bacula support for Nagios. %patch6 -p1 %patch7 -p1 %patch8 -p1 - +%patch9 -p1 %patch10 -p1 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . @@ -391,7 +398,7 @@ install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/ desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ --remove-key=Encoding \ - --set-key=Categories --set-value="Utility" \ + --set-key=Categories --set-value="Utility;" \ scripts/bat.desktop # QT Tray monitor @@ -402,7 +409,7 @@ install -p -m 644 -D bacula-tray-monitor.png %{buildroot}%{_datadir}/pixmaps/bac desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ --remove-key=Encoding \ - --set-key=Categories --set-value="Utility" \ + --set-key=Categories --set-value="Utility;" \ --set-key=Icon --set-value="/usr/share/pixmaps/bacula-tray-monitor.png" \ scripts/bacula-tray-monitor.desktop @@ -727,6 +734,11 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Thu Jul 20 2017 Simone Caronni - 9.0.1-2 +- Add patch to allow compilation on MariaDB 10.2. +- Make only Fedora 27 require perl-interpreter. +- Adjust categories in desktop files for RHEL 7. + * Tue Jul 18 2017 Simone Caronni - 9.0.1-1 - Update to 9.0.1.