Replace user dbus.socket and dbus.service file.submit/tizen/20170329.152406accepted/tizen/wearable/20170330.223657accepted/tizen/unified/20170330.223742accepted/tizen/tv/20170330.223645accepted/tizen/mobile/20170330.223629accepted/tizen/ivi/20170330.223726accepted/tizen/common/20170330.151521

The dbus source includes dbus.socket and dbus.service for user session.
But tizen uses its own files.

Signed-off-by: INSUN PYO <insun.pyo@samsung.com>
Change-Id: Ied720b0fd5e792845ab626f680d01cbb3e9b2db9

3 files changed, 24 insertions, 51 deletions

diff --git a/packaging/dbus-user.service b/packaging/dbus-user.service
deleted file mode 100644
index d1a283a9..00000000
--- a/packaging/dbus-user.service
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#
-# This is the D-Bus service for the session
-#
-
-[Unit]
-Description=D-Bus Session Message Bus
-Requires=dbus.socket
-DefaultDependencies=no
-
-[Service]
-ExecStart=/usr/bin/dbus-daemon --session --address=systemd: --nofork --systemd-activation
-ExecReload=/usr/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
-Capabilities=all-eip
diff --git a/packaging/dbus-user.socket b/packaging/dbus-user.socket
deleted file mode 100644
index 8a12c490..00000000
--- a/packaging/dbus-user.socket
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#
-# This is the D-Bus socket for the session bus
-#
-
-[Unit]
-Description=D-Bus Session Message Bus Socket
-
-[Socket]
-ListenStream=%t/dbus/user_bus_socket
-
diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index d6bf044c..4ce10ebd 100644
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -15,30 +15,28 @@ Group:          Base/IPC
 
 %define with_systemd 1
 
-BuildRequires:  expat-devel
-BuildRequires:  libtool
 BuildRequires:  libzio
+BuildRequires:  libtool
 BuildRequires:  pkg-config
+BuildRequires:  expat-devel
+BuildRequires:  libcap-ng-devel
 %if %{with_systemd}
 BuildRequires:  pkgconfig(libsystemd)
 %endif
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libsmack)
-BuildRequires:  pkgconfig(cynara-client-async)
+BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-session)
+BuildRequires:  pkgconfig(cynara-client-async)
+BuildRequires:  pkgconfig(libdbuspolicy1)
 Version:        1.10.6
 Release:        0
 Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 Source1:        rc.boot.dbus
 Source3:        dbus_at_console.ck
 Source4:        baselibs.conf
-Source5:        dbus-user.service
-Source6:        dbus-user.socket
 Source7:        dbus.sh
 Source1001:     dbus.manifest
-BuildRequires:  libcap-ng-devel
-BuildRequires:  pkgconfig(libdbuspolicy1)
-BuildRequires:  pkgconfig(cynara-client)
-BuildRequires:	pkgconfig(glib-2.0)
 # COMMON1-END
 Requires(pre):  /usr/sbin/groupadd /usr/sbin/useradd
 Provides:       dbus-1
@@ -139,6 +137,8 @@ export V=1
     --with-system-pid-file=/tmp/dbus_launch				\
     --with-console-auth-dir=/var/run/dbus/at_console/			\
     --with-systemdsystemunitdir=%{_unitdir}				\
+    --with-systemduserunitdir=%{_unitdir_user}                          \
+    --enable-user-session                                               \
     --enable-smack \
     --enable-cynara \
     --enable-modular-tests \
@@ -174,6 +174,8 @@ popd
     --with-system-pid-file=/tmp/dbus_launch				\
     --with-console-auth-dir=/var/run/dbus/at_console/			\
     --with-systemdsystemunitdir=%{_unitdir}				\
+    --with-systemduserunitdir=%{_unitdir_user}                          \
+    --enable-user-session                                               \
     --enable-smack \
     --enable-cynara \
     --enable-modular-tests \
@@ -204,6 +206,8 @@ find dbus -name '*.gcno' -exec cp '{}' coverage-objects ';'
     --with-system-pid-file=/tmp/dbus_launch				\
     --with-console-auth-dir=/var/run/dbus/at_console/			\
     --with-systemdsystemunitdir=%{_unitdir}				\
+    --with-systemduserunitdir=%{_unitdir_user}                          \
+    --enable-user-session                                               \
     --enable-smack \
     --enable-cynara \
     --enable-modular-tests \
@@ -234,16 +238,9 @@ install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
 mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
 touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
 
-mkdir -p %{buildroot}%{_unitdir_user}
-install -m 0644 %{SOURCE5} %{buildroot}%{_unitdir_user}/dbus.service
-install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir_user}/dbus.socket
-
 mkdir -p %{buildroot}%{_unitdir_user}/basic.target.wants
 ln -sf ../dbus.service %{buildroot}%{_unitdir_user}/basic.target.wants/dbus.service
 
-mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
-ln -sf ../dbus.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/dbus.socket
-
 rm -rf %{buildroot}/%{_libdir}/*.la
 rm -rf %{buildroot}/%{_bindir}/dbus-launch
 
@@ -328,20 +325,21 @@ popd
 %ghost %{_localstatedir}/run/dbus
 %ghost %{_localstatedir}/lib/dbus/machine-id
 %dir %{_unitdir}
-%{_unitdir}/dbus.service
 %{_unitdir}/dbus.socket
-%{_unitdir_user}/dbus.service
+%{_unitdir}/dbus.service
+%dir %{_unitdir}/sockets.target.wants
+%{_unitdir}/sockets.target.wants/dbus.socket
+%dir %{_unitdir}/multi-user.target.wants
+%{_unitdir}/multi-user.target.wants/dbus.service
+%dir %{_unitdir}/dbus.target.wants
+%{_unitdir}/dbus.target.wants/dbus.socket
+%dir %{_unitdir_user}
 %{_unitdir_user}/dbus.socket
-%dir %{_unitdir_user}/basic.target.wants
-%{_unitdir_user}/basic.target.wants/dbus.service
+%{_unitdir_user}/dbus.service
 %dir %{_unitdir_user}/sockets.target.wants
 %{_unitdir_user}/sockets.target.wants/dbus.socket
-%dir %{_unitdir}/dbus.target.wants
-%{_unitdir}/dbus.target.wants/dbus.socket
-%dir %{_unitdir}/multi-user.target.wants
-%{_unitdir}/multi-user.target.wants/dbus.service
-%dir %{_unitdir}/sockets.target.wants
-%{_unitdir}/sockets.target.wants/dbus.socket
+%dir %{_unitdir_user}/basic.target.wants
+%{_unitdir_user}/basic.target.wants/dbus.service
 %dir %{_sysconfdir}/dbus-1
 %dir %{_datadir}/dbus-1/session.d
 %dir %{_datadir}/dbus-1/system.d