From 1ccc1e00410d01028cc62eda60fcea681ea26203 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 9 Jul 2024 17:42:21 +0200
Subject: [PATCH] contrib/rpm: install firewall zone unconditionally

It's the same on all systems we care about.
---
 contrib/fedora/rpm/NetworkManager.spec | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index d7f595743..24a6e3e17 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -111,11 +111,6 @@
 %else
 %bcond_without iwd
 %endif
-%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
-%bcond_without firewalld_zone
-%else
-%bcond_with firewalld_zone
-%endif
 
 ###############################################################################
 
@@ -338,9 +333,7 @@ BuildRequires: libasan
 BuildRequires: libubsan
 %endif
 %endif
-%if %{with firewalld_zone}
 BuildRequires: firewalld-filesystem
-%endif
 BuildRequires: iproute
 %if 0%{?fedora} || 0%{?rhel} >= 8
 BuildRequires: iproute-tc
@@ -758,11 +751,6 @@ Preferably use nmcli instead.
 	-Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \
 %else
 	-Dppp=false \
-%endif
-%if %{with firewalld_zone}
-	-Dfirewalld_zone=true \
-%else
-	-Dfirewalld_zone=false \
 %endif
 	-Ddist_version=%{version}-%{release} \
 %if %{?config_plugins_default_ifcfg_rh}
@@ -910,11 +898,7 @@ autoreconf --install --force
 %else
 	--enable-ppp=no \
 %endif
-%if %{with firewalld_zone}
 	--enable-firewalld-zone=yes \
-%else
-	--enable-firewalld-zone=no \
-%endif
 	--with-dist-version=%{version}-%{release} \
 %if %{?config_plugins_default_ifcfg_rh}
 	--with-config-plugins-default=ifcfg-rh \
@@ -1023,9 +1007,7 @@ if [ -S /run/udev/control ]; then
     /usr/bin/udevadm control --reload-rules || :
     /usr/bin/udevadm trigger --subsystem-match=net || :
 fi
-%if %{with firewalld_zone}
 %firewalld_reload
-%endif
 
 %systemd_post %{systemd_units}
 
@@ -1076,9 +1058,7 @@ fi
 %postun
 /usr/bin/udevadm control --reload-rules || :
 /usr/bin/udevadm trigger --subsystem-match=net || :
-%if %{with firewalld_zone}
 %firewalld_reload
-%endif
 
 %systemd_postun %{systemd_units}
 
@@ -1150,9 +1130,7 @@ fi
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
 %{_datadir}/polkit-1/actions/*.policy
 %{_prefix}/lib/udev/rules.d/*.rules
-%if %{with firewalld_zone}
 %{_prefix}/lib/firewalld/zones/nm-shared.xml
-%endif
 # systemd stuff
 %{_unitdir}/NetworkManager.service
 %{_unitdir}/NetworkManager-wait-online.service