[libvirt PATCH v2 2/9] spec: firewalld is always enabled
Knowing this, we can remove some code.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
Reviewed-by: Neal Gompa <ngompa13(a)gmail.com>
---
libvirt.spec.in | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 36a2cac2b2..508b4c8dcc 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -88,7 +88,6 @@
%define with_fuse 0
%define with_sanlock 0
%define with_numad 0
-%define with_firewalld 0
%define with_firewalld_zone 0
%define with_libssh2 0
%define with_wireshark 0
@@ -138,8 +137,6 @@
%endif
%endif
-%define with_firewalld 1
-
%if 0%{?fedora} || 0%{?rhel} > 7
%define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
%endif
@@ -1089,12 +1086,6 @@ exit 1
%define arg_sanlock -Dsanlock=disabled
%endif
-%if %{with_firewalld}
- %define arg_firewalld -Dfirewalld=enabled
-%else
- %define arg_firewalld -Dfirewalld=disabled
-%endif
-
%if %{with_firewalld_zone}
%define arg_firewalld_zone -Dfirewalld_zone=enabled
%else
@@ -1170,7 +1161,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y'
%{_specdir}/%{name}.spec)
-Dlibpcap=enabled \
-Daudit=enabled \
-Ddtrace=enabled \
- %{?arg_firewalld} \
+ -Dfirewalld=enabled \
%{?arg_firewalld_zone} \
%{?arg_wireshark} \
-Dpm_utils=disabled \
--
2.26.2