External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

spec: firewalld is always enabled

Browse Source 
Knowing this, we can remove some code.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Andrea Bolognani 2020-10-05 18:31:37 +02:00
parent 31d687a321
commit c2402b818c
1 changed files with 1 additions and 10 deletions

11
libvirt.spec.in

@ -88,7 +88,6 @@
%define with_fuse 0 %define with_fuse 0
%define with_sanlock 0 %define with_sanlock 0
%define with_numad 0 %define with_numad 0
%define with_firewalld 0
%define with_firewalld_zone 0 %define with_firewalld_zone 0
%define with_libssh2 0 %define with_libssh2 0
%define with_wireshark 0 %define with_wireshark 0
@ -138,8 +137,6 @@
%endif %endif
%endif %endif
%define with_firewalld 1
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%define with_firewalld_zone 0%{!?_without_firewalld_zone:1} %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
%endif %endif
@ -1089,12 +1086,6 @@ exit 1
%define arg_sanlock -Dsanlock=disabled %define arg_sanlock -Dsanlock=disabled
%endif %endif
%if %{with_firewalld}
%define arg_firewalld -Dfirewalld=enabled
%else
%define arg_firewalld -Dfirewalld=disabled
%endif
%if %{with_firewalld_zone} %if %{with_firewalld_zone}
%define arg_firewalld_zone -Dfirewalld_zone=enabled %define arg_firewalld_zone -Dfirewalld_zone=enabled
%else %else
@ -1171,7 +1162,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
-Dlibnl=enabled \ -Dlibnl=enabled \
-Daudit=enabled \ -Daudit=enabled \
-Ddtrace=enabled \ -Ddtrace=enabled \
%{?arg_firewalld} \ -Dfirewalld=enabled \
%{?arg_firewalld_zone} \ %{?arg_firewalld_zone} \
%{?arg_wireshark} \ %{?arg_wireshark} \
-Dpm_utils=disabled \ -Dpm_utils=disabled \