packaging: move murphyd.service to systemd user session.

Change-Id: I390d190a3d2d621a37527e652040d667a36afe08

diff --git a/packaging.in/murphyd.service b/packaging.in/murphyd.service
index f05879d..8b6fda2 100644 (file)
--- a/packaging.in/murphyd.service
+++ b/packaging.in/murphyd.service
@@ -3,13 +3,8 @@ Description=Murphy Resource Policy Daemon
 
 [Service]
 Type=simple
-User=app
-Group=app
 ExecStart=/usr/bin/murphyd -t systemd -vvv -f
-SmackExecLabel=User
 KillSignal=SIGTERM
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
-Environment=XDG_RUNTIME_DIR=/run/user/%U
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target

diff --git a/packaging/murphy.spec b/packaging/murphy.spec
index 6f06420..d06b864 100644 (file)
--- a/packaging/murphy.spec
+++ b/packaging/murphy.spec
@@ -474,12 +474,7 @@ cp packaging.in/murphyd.conf %{buildroot}%{_tmpfilesdir}
 # Copy the systemd files in place.
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_unitdir_user}
-cp packaging.in/murphyd.service %{buildroot}%{_unitdir}
-%if %{_enable_icosyscon}
-# cp packaging.in/ico-homescreen.service %{buildroot}%{_unitdir_user}
-# cp packaging.in/murphy-wait-for-launchpad-ready.path \
-#     %{buildroot}%{_unitdir_user}
-%endif
+cp packaging.in/murphyd.service %{buildroot}%{_unitdir_user}
 
 %if %{?_with_dbus:1}%{!?_with_dbus:0}
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
@@ -498,7 +493,7 @@ cp packaging.in/gam-*.names packaging.in/gam-*.tree \
 rm -rf %{buildroot}
 
 %post
-/bin/systemctl enable murphyd.service
+/bin/systemctl --user enable --global murphyd.service
 setcap 'cap_net_admin=+ep' %{_bindir}/murphyd
 
 %if %{?_with_squashpkg:0}%{!?_with_squashpkg:1}
@@ -508,7 +503,7 @@ ldconfig
 
 %postun
 if [ "$1" = "0" ]; then
-/bin/systemctl disable murphyd.service
+/bin/systemctl --user disable --global murphyd.service
 fi
 
 %if %{?_with_squashpkg:0}%{!?_with_squashpkg:1}
@@ -563,7 +558,7 @@ ldconfig
 %manifest murphy.manifest
 %{_bindir}/murphyd
 %config %{_sysconfdir}/murphy
-%{_unitdir}/murphyd.service
+%{_unitdir_user}/murphyd.service
 %{_tmpfilesdir}/murphyd.conf
 %if %{?_with_audiosession:1}%{!?_with_audiosession:0}
 %{_sbindir}/asm-bridge
@@ -742,8 +737,6 @@ ldconfig
 %files system-controller
 %defattr(-,root,root,-)
 %{_libdir}/murphy/plugins/plugin-system-controller.so
-# %{_unitdir_user}/ico-homescreen.service
-# %{_unitdir_user}/murphy-wait-for-launchpad-ready.path
 %manifest murphy.manifest
 %endif