From f93928f69022c37e80a302ea01f9a1961d65b486 Mon Sep 17 00:00:00 2001
From: seuzw <930zhaowei@163.com>
Date: Mon, 7 Mar 2022 16:03:07 +0800
Subject: [PATCH] fix the issue that NetworkManager service does not self-heal
 when the dbus service is abnormal

---
 NetworkManager.spec                           |  9 ++++++-
 ...e-PartOf-replace-Requires-in-service.patch | 25 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 bugfix-use-PartOf-replace-Requires-in-service.patch

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 3bf3031..3618174 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -50,7 +50,7 @@
 Name:             NetworkManager
 Version:          1.32.12
 Epoch:            1
-Release:          2
+Release:          3
 Summary:          Network Link Manager and User Applications
 License:          GPLv2+
 URL:              https://www.gnome.org/projects/NetworkManager/
@@ -58,6 +58,7 @@ Source:           https://download.gnome.org/sources/NetworkManager/%{real_versi
 Source1:          NetworkManager.conf
 Source2:          00-server.conf
 Patch1:           fix-wants-and-add-requires.patch
+Patch2:           bugfix-use-PartOf-replace-Requires-in-service.patch
 
 BuildRequires:    gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel
 BuildRequires:    dbus-devel dbus-glib-devel  glib2-devel gobject-introspection-devel jansson-devel
@@ -475,6 +476,12 @@ fi
 %{_datadir}/gtk-doc/html/NetworkManager/*
 
 %changelog
+* Mon Mar 7 2022 seuzw <930zhaowei@163.com> - 1.32.12-3
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix the issue that NetworkManager service does not self-heal when the dbus service is abnormal
+
 * Tue Jan 11 2022 gaoxingwang <gaoxingwang@huawei.com> - 1.32.12-2
 - Type:bugfix
 - ID:NA
diff --git a/bugfix-use-PartOf-replace-Requires-in-service.patch b/bugfix-use-PartOf-replace-Requires-in-service.patch
new file mode 100644
index 0000000..976da0c
--- /dev/null
+++ b/bugfix-use-PartOf-replace-Requires-in-service.patch
@@ -0,0 +1,25 @@
+From 75e1259d22d10fe05a05c0bda5ce4d5beb5800d5 Mon Sep 17 00:00:00 2001
+From: gaoxingwang <gaoxingwang@huawei.com>
+Date: Sat, 26 Feb 2022 14:59:43 +0800
+Subject: [PATCH] use PartOf replace Requires in service
+
+---
+ data/NetworkManager.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
+index b29b634..c9a9d88 100644
+--- a/data/NetworkManager.service.in
++++ b/data/NetworkManager.service.in
+@@ -4,7 +4,7 @@ Documentation=man:NetworkManager(8)
+ Wants=network.target dbus.socket
+ After=network-pre.target dbus.service dbus.socket
+ Before=network.target @DISTRO_NETWORK_SERVICE@
+-Requires=dbus.service
++PartOf=dbus.service
+ 
+ [Service]
+ Type=dbus
+-- 
+2.27.0
+