From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 30 Apr 2019 14:39:31 +0000 (-0400)
Subject: spec: fix f28 rpm without firewalld zone
X-Git-Tag: v5.3.0-rc2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c4b016622ef8ea1b9135a5c4d948c38b42260f;p=thirdparty%2Flibvirt.git

spec: fix f28 rpm without firewalld zone

Commit 3b71f2e42d added spec handling for with_firewalld_zone. We
now call %firewalld_reload if with_firewalld is set. But the matching
'BuildRequires: firewalld-filesystem' is only applied if
with_firewalld_zone is set.

Fix the former bit to use with_firewalld_zone

Reviewed-by: Laine Stump <laine@laine.org>
Reported-by: Yuval Turgeman <yturgema@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 18f0a0e217..876b2f0897 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1387,12 +1387,12 @@ fi
 rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
 %post daemon-driver-network
-%if %{with_firewalld}
+%if %{with_firewalld_zone}
     %firewalld_reload
 %endif
 
 %postun daemon-driver-network
-%if %{with_firewalld}
+%if %{with_firewalld_zone}
     %firewalld_reload
 %endif