From 19e91eaa0c453c509bf3d1b3707214a5aa588c84 Mon Sep 17 00:00:00 2001
From: "gs86.lee" <gs86.lee@samsung.com>
Date: Fri, 26 Jun 2015 16:27:52 +0900
Subject: [PATCH] Change system session to user session

Change-Id: Ia7b90d20d75fb2613f0f32a89e1f4dffa6636d23
---
 packaging/starter.service |  2 --
 packaging/starter.spec    | 41 ++++++++++++++++++-----------------------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/packaging/starter.service b/packaging/starter.service
index 2a8bc63..2b5ce35 100644
--- a/packaging/starter.service
+++ b/packaging/starter.service
@@ -9,8 +9,6 @@ ExecStart=/usr/bin/starter
 Restart=always
 RestartSec=0
 KillSignal=SIGKILL
-User=system
-Group=system
 SmackProcessLabel=starter
 
 [Install]
diff --git a/packaging/starter.spec b/packaging/starter.spec
index 4daed74..084f4c2 100644
--- a/packaging/starter.spec
+++ b/packaging/starter.spec
@@ -1,5 +1,5 @@
 %bcond_with wayland
-%define __libdir /usr/lib
+%define __usrdir /usr/lib/systemd/user
 
 Name:       starter
 Summary:    starter
@@ -107,23 +107,20 @@ make -j1
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{__libdir}/systemd/system/multi-user.target.wants
-mkdir -p %{buildroot}%{__libdir}/systemd/system/tizen-system.target.wants
+mkdir -p %{buildroot}%{__usrdir}/default.target.wants
 mkdir -p %{buildroot}%{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
 
-install -m 0644 %SOURCE1 %{buildroot}%{__libdir}/systemd/system/starter.service
-ln -s ../starter.service %{buildroot}%{__libdir}/systemd/system/multi-user.target.wants/starter.service
-ln -s %{__libdir}/systemd/system/starter.service %{buildroot}%{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
+install -m 0644 %SOURCE1 %{buildroot}%{__usrdir}/starter.service
+ln -s ../starter.service %{buildroot}%{__usrdir}/default.target.wants/starter.service
 
-install -m 0644 %SOURCE2 %{buildroot}%{__libdir}/systemd/system/starter.path
-ln -s ../starter.path %{buildroot}%{__libdir}/systemd/system/multi-user.target.wants/starter.path
+install -m 0644 %SOURCE2 %{buildroot}%{__usrdir}/starter.path
+ln -s ../starter.path %{buildroot}%{__usrdir}/default.target.wants/starter.path
 
-install -m 0644 %SOURCE3 %{buildroot}%{__libdir}/systemd/system/starter-pre.service
-ln -s ../starter-pre.service %{buildroot}%{__libdir}/systemd/system/multi-user.target.wants/starter-pre.service
-ln -s %{__libdir}/systemd/system/starter-pre.service %{buildroot}%{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
+install -m 0644 %SOURCE3 %{buildroot}%{__usrdir}/starter-pre.service
+ln -s ../starter-pre.service %{buildroot}%{__usrdir}/default.target.wants/starter-pre.service
 
-install -m 0644 %SOURCE4 %{buildroot}%{__libdir}/systemd/system/starter-pre.path
-ln -s ../starter-pre.path %{buildroot}%{__libdir}/systemd/system/multi-user.target.wants/starter-pre.path
+install -m 0644 %SOURCE4 %{buildroot}%{__usrdir}/starter-pre.path
+ln -s ../starter-pre.path %{buildroot}%{__usrdir}/default.target.wants/starter-pre.path
 
 mkdir -p %{buildroot}/usr/share/license
 cp -f LICENSE %{buildroot}/usr/share/license/%{name}
@@ -160,16 +157,14 @@ sync
 %{_sysconfdir}/init.d/rd4starter
 %{_sysconfdir}/init.d/rd3starter
 %{_bindir}/starter
-%{__libdir}/systemd/system/starter.service
-%{__libdir}/systemd/system/starter.path
-%{__libdir}/systemd/system/starter-pre.service
-%{__libdir}/systemd/system/starter-pre.path
-%{__libdir}/systemd/system/multi-user.target.wants/starter.service
-%{__libdir}/systemd/system/multi-user.target.wants/starter.path
-%{__libdir}/systemd/system/multi-user.target.wants/starter-pre.service
-%{__libdir}/systemd/system/multi-user.target.wants/starter-pre.path
-%{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/starter.service
-%{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/starter-pre.service
+%{__usrdir}/starter.service
+%{__usrdir}/starter.path
+%{__usrdir}/starter-pre.service
+%{__usrdir}/starter-pre.path
+%{__usrdir}/default.target.wants/starter.service
+%{__usrdir}/default.target.wants/starter.path
+%{__usrdir}/default.target.wants/starter-pre.service
+%{__usrdir}/default.target.wants/starter-pre.path
 /usr/share/license/%{name}
 /opt/data/home-daemon
 /usr/share/locale/*/LC_MESSAGES/*
-- 
2.7.4