From: Davide Franco <packager@dflc.ch>
Date: Sun, 28 Feb 2021 18:57:34 +0000 (+0000)
Subject: rpms: Fix bacula.spec for Fedora 31
X-Git-Tag: Release-11.0.2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=100fb0e44ea21677c7e944d76cc1bc86a79ca9be;p=thirdparty%2Fbacula.git

rpms: Fix bacula.spec for Fedora 31
---

diff --git a/bacula/platforms/rpms/redhat/bacula.spec.in b/bacula/platforms/rpms/redhat/bacula.spec.in
index 645ab58da..4ec5c3666 100644
--- a/bacula/platforms/rpms/redhat/bacula.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula.spec.in
@@ -135,6 +135,8 @@ Source2: Release_Notes-%{version}-%{release}.tar.gz
 %{?build_fc26:%define fc26 1}
 %define fc27 0
 %{?build_fc27:%define fc27 1}
+%define fc31 0
+%{?build_fc31:%define fc31 1}
 # RedHat Enterprise builds
 %define rhel3 0
 %{?build_rhel3:%define rhel3 1}
@@ -214,7 +216,7 @@ Source2: Release_Notes-%{version}-%{release}.tar.gz
 # if the platform is using systemd
 %define usesystemd 0
 
-%if %{rhel7} || %{rhel8} || %{fc22}|| %{fc25} || %{fc26} || %{fc27} || %{centos7}
+%if %{rhel7} || %{rhel8} || %{fc22}|| %{fc25} || %{fc26} || %{fc27} || %{fc31} || %{centos7}
 %define usesystemd 1
 %endif
 
@@ -233,7 +235,7 @@ Source2: Release_Notes-%{version}-%{release}.tar.gz
 %define rhat 1
 %endif
 %define fed 0
-%if %{fc16} || %{fc17} || %{fc18} || %{fc22} || %{fc25} || %{fc26} || %{fc27}
+%if %{fc16} || %{fc17} || %{fc18} || %{fc22} || %{fc25} || %{fc26} || %{fc27} || %{fc31}
 %define fed 1
 %endif
 %define suse 0
@@ -296,7 +298,7 @@ exit 1
 %{?build_x86_64:%define x86_64 1}
 
 # check what distribution we are
-%if %{fc16} || %{fc17} || %{fc18} || %{fc22} || %{fc25} || %{fc26} || %{fc27}
+%if %{fc16} || %{fc17} || %{fc18} || %{fc22} || %{fc25} || %{fc26} || %{fc27} || %{fc31}
 %define _dist %(grep Fedora /etc/redhat-release)
 %endif
 %if %{centos7} || %{centos6}
@@ -575,7 +577,7 @@ cd ${cwd}
 %endif
 
 ## Do not build lzo on rhel8/centos8
-%if !%{rhel8}
+%if ! ( %{rhel8} ||  %{fc31})
 cd %{depkgs}
 make lzo
 export LDFLAGS="${LDFLAGS} -L${PWD}/lzo/lib"