From: Laine Stump <laine@laine.org>
Date: Thu, 11 Apr 2019 16:53:54 +0000 (-0400)
Subject: build: set --without-firewalld-zone in configure commandline for Fedora 30
X-Git-Tag: v5.3.0-rc1~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65b08aff08df4eb9593620274e5a09e1b92f24aa;p=thirdparty%2Flibvirt.git

build: set --without-firewalld-zone in configure commandline for Fedora 30

The firewalld package in Fedora 30 didn't get support for rich rule
priorities, which is required by the libvirt zonefile that's installed
when the build is configured with --with-firewalld-zone, so we need to
set --without-firewalld-zone for that version of Fedora. The needed
feature is already upstream in firewalld, so it just needs another
upstream release to be there. Let's be optimistic and assume that will
happen prior to F31.

Resolves: https://bugzilla.redhat.com/1699051
Signed-off-by: Laine Stump <laine@laine.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Eric Garver <eric@garver.life>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 8ea27c91a3..18f0a0e217 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -137,7 +137,7 @@
 
 %define with_firewalld 1
 
-%if 0%{?fedora} >= 30 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 31 || 0%{?rhel} > 7
     %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
 %endif