From e102acfdd946a5586e04123335ee4d053e7804f9 Mon Sep 17 00:00:00 2001
From: licunlong <licunlong1@huawei.com>
Date: Fri, 2 Dec 2022 16:26:10 +0800
Subject: [PATCH] Optimize installing and removing dbus-broker

---
 dbus-broker.spec | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/dbus-broker.spec b/dbus-broker.spec
index c5cccd9..dbcdd9b 100644
--- a/dbus-broker.spec
+++ b/dbus-broker.spec
@@ -1,6 +1,6 @@
 Name:     dbus-broker
 Version:  31
-Release:  1
+Release:  2
 Summary:  Linux D-Bus Message Broker
 License:  Apache-2.0
 URL:      https://github.com/bus1/dbus-broker
@@ -48,15 +48,22 @@ if ! getent passwd dbus > /dev/null ; then
 fi
 
 %preun
-%systemd_preun dbus-broker.service
 %systemd_user_preun dbus-broker.service
+# Disable and stop dbus-broker.service after pre uninstalling
+if [ $1 == 0 ] && [ -x /usr/bin/systemctl ]; then
+    systemctl disable dbus-broker.service &>/dev/null || :
+    systemctl reset-failed dbus-broker.service &>/dev/null || :
+    systemctl stop dbus-broker.service &>/dev/null || :
+fi
 
 %post
-%systemd_post dbus-broker.service
 %systemd_user_post dbus-broker.service
+# Enable after installing
+if [ $1 == 1 ] && [ -x /usr/bin/systemctl ]; then
+    systemctl --no-reload enable dbus-broker.service &>/dev/null || :
+fi
 
 %postun
-%systemd_postun dbus-broker.service
 %systemd_user_postun dbus-broker.service
 
 %files
@@ -69,23 +76,26 @@ fi
 %{_userunitdir}/dbus-broker.service
 
 %changelog
+* Fri Dec 02 2022 licunlong<licunlong1@huawei.com> - 31-2
+- Optimize installing and removing dbus-broker
+
 * Wed Jun 15 2022 dillon chen <dillon.chen@gmail.com> - 31-1
 - update to 31
 
 * Fri May 20 2022 liukuo <liukuo@kylinos.cn> - 29-3
 - License compliance rectification
 
-* Tue Feb 22 2022 licunlong<licunlong1@huawei.com> - 29.2
+* Tue Feb 22 2022 licunlong<licunlong1@huawei.com> - 29-2
 - Type:bugfix
 - CVE:NA
 - SUG:NA
 - DESC:don't enable/disable dbus.socket when install/uninstall dbus-broker.
 
-* Thu Dec 16 2021 licunlong<licunlong1@huawei.com> - 29.1
+* Thu Dec 16 2021 licunlong<licunlong1@huawei.com> - 29-1
 - Type:enhance
 - CVE:NA
 - SUG:NA
 - DESC:update dbus-broker to v29
 
-* Thu Aug 05 2021 openEuler BuildTeam <buildteam@openeuler.org> - 28.1
+* Thu Aug 05 2021 openEuler BuildTeam <buildteam@openeuler.org> - 28-1
 - Package Init.