From c0ab8c0828ce96e74b0583e1956bebb97f1becf0 Mon Sep 17 00:00:00 2001
From: eaglegai <eaglegai@163.com>
Date: Fri, 14 May 2021 16:26:58 +0800
Subject: [PATCH] add macro firewalld_zone to fix firewalld error about
 nm-shared.xml

---
 NetworkManager.spec | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/NetworkManager.spec b/NetworkManager.spec
index ef9803c..6a318bc 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -38,6 +38,7 @@
 %bcond_with libnm_glib
 %bcond_without crypto_gnutls
 %bcond_without nm_cloud_setup
+%bcond_with    firewalld_zone
 
 %global dbus_version 1.1
 %global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
@@ -47,7 +48,7 @@
 Name:             NetworkManager
 Version:          1.26.2
 Epoch:            1
-Release:          3
+Release:          4
 Summary:          Network Link Manager and User Applications
 License:          GPLv2+
 URL:              https://www.gnome.org/projects/NetworkManager/
@@ -67,6 +68,10 @@ BuildRequires:    ModemManager-glib-devel newt-devel /usr/bin/dbus-launch python
 BuildRequires:    python2 pygobject3-base python2-dbus
 %endif
 
+%if %{with firewalld_zone}
+BuildRequires:    firewalld-filesystem
+%endif
+
 Requires(post):   systemd
 Requires(post):   /usr/sbin/update-alternatives
 Requires(preun):  systemd
@@ -243,6 +248,11 @@ intltoolize --automake --copy --force
 %if %{with ppp}
 	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
 	--enable-ppp=yes \
+%endif
+%if %{with firewalld_zone}
+	--enable-firewalld-zone \
+%else
+	--disable-firewalld-zone \
 %endif
 	--with-dist-version=%{version}-%{release} \
 	--with-config-plugins-default='ifcfg-rh' \
@@ -312,6 +322,10 @@ fi
 /usr/bin/udevadm control --reload-rules || :
 /usr/bin/udevadm trigger --subsystem-match=net || :
 
+%if %{with firewalld_zone}
+%firewalld_reload
+%endif
+
 %systemd_postun NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
 
 %ldconfig_scriptlets glib
@@ -369,7 +383,9 @@ fi
 %{_prefix}/lib/%{name}/dispatcher.d/90-nm-cloud-setup.sh
 %{_prefix}/lib/%{name}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
 %endif
+%if %{with firewalld_zone}
 %{_prefix}/lib/firewalld/zones/nm-shared.xml
+%endif
 
 %files wwan
 %defattr(-,root,root)
@@ -407,6 +423,12 @@ fi
 %{_datadir}/gtk-doc/html/NetworkManager/*
 
 %changelog
+* Fri May 14 2021 gaihuiying <gaihuiying1@huawei.com> - 1.26.2-4
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:add macro firewalld_zone to fix firewalld error about nm-shared.xml
+
 * Thu Dec 10 2020 yuboyun <yuboyun@huawei.com> - 1.26.2-3
 - Type:bugfix
 - ID:NA
-- 
Gitee