[libvirt PATCH 2/9] spec: firewalld is always enabled

[Neal Gompa]

On Mon, Oct 5, 2020 at 2:40 PM Andrea Bolognani <abologna at redhat.com> wrote:
>
> Knowing this, we can remove some code.
>
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
>  libvirt.spec.in | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 815ab246e9..4572044d2d 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
> @@ -1088,12 +1085,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
> @@ -1169,7 +1160,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
>

Reviewed-by: Neal Gompa <ngompa13 at gmail.com>

-- 
真実はいつも一つ！/ Always, there's only one truth!