From 611953afd55bbb691e63b21debdac08e51230453 Mon Sep 17 00:00:00 2001
From: openeuler-basic <shenyangyang4@huawei.com>
Date: Thu, 9 Jan 2020 16:09:47 +0800
Subject: [PATCH] dbus.spec: delete messagebus.service

---
 00-start-message-bus.sh | 18 +++++-------------
 dbus.spec               |  8 ++++----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/00-start-message-bus.sh b/00-start-message-bus.sh
index 582b424..71bdbdd 100644
--- a/00-start-message-bus.sh
+++ b/00-start-message-bus.sh
@@ -1,14 +1,6 @@
-#!/bin/sh
-# Copyright (C) 2008 Red Hat, Inc.
-#
-# All rights reserved. This copyrighted material is made available to anyone
-# wishing to use, modify, copy, or redistribute it subject to the terms and
-# conditions of the GNU General Public License version 2.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-        eval `dbus-launch --sh-syntax --exit-with-session`
+## test for an existing bus daemon, just to be safe
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+	## if not found, launch a new one
+	eval `dbus-launch --sh-syntax --exit-with-session`
+	echo "D-Bus per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
 fi
diff --git a/dbus.spec b/dbus.spec
index 1d878ba..557fdc2 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -1,7 +1,7 @@
 Name:     dbus
 Epoch:    1
 Version:  1.12.16
-Release:  4
+Release:  5
 Summary:  System Message Bus
 License:  AFLv2.1 or GPLv2+
 URL:      http://www.freedesktop.org/Software/dbus/
@@ -70,8 +70,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/interfaces
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run/dbus
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/dbus
 
-ln -s dbus.service $RPM_BUILD_ROOT%{_unitdir}/messagebus.service
-
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete -print
 %check
 make check
@@ -123,7 +121,6 @@ make check
 %{_tmpfilesdir}/dbus.conf
 %{_unitdir}/dbus.service
 %{_unitdir}/dbus.socket
-%{_unitdir}/messagebus.service
 %{_unitdir}/multi-user.target.wants/dbus.service
 %{_unitdir}/sockets.target.wants/dbus.socket
 %{_userunitdir}/dbus.service
@@ -164,6 +161,9 @@ make check
 %exclude %{_pkgdocdir}/README
 
 %changelog
+* Thu Jan 9 2020 hexiaowen <hexiaowen@huawei.com> - 1:1.12.16-5
+- delete messagebus.service
+
 * Tue Sep 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:1.12.16-4
 - Add build requires to add runtime requires and add a start-message-bus.sh