packages/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!33 add macro firewalld_zone to fix firewalld error about nm-shared.xml

Browse Source 
From: @eaglegai
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2021-05-15 10:10:03 +08:00 committed by Gitee
commit 6b2ab0f899
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
NetworkManager.spec
View File

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