From 4dcf036a512ff60b125f04da156a48ac7931122c Mon Sep 17 00:00:00 2001 From: Yin Kangkai Date: Tue, 7 Jan 2014 15:54:17 +0800 Subject: Update systemd user session services. Change-Id: I470c6de3f5c40c4de6f1ed5ca77abf0737a56f67 Signed-off-by: Yin Kangkai --- packaging/tizen-mobile-session.changes | 3 +++ packaging/tizen-mobile-session.spec | 24 +++--------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/packaging/tizen-mobile-session.changes b/packaging/tizen-mobile-session.changes index 0d8b231..9a710b4 100644 --- a/packaging/tizen-mobile-session.changes +++ b/packaging/tizen-mobile-session.changes @@ -1,3 +1,6 @@ +* Tue Jan 07 2014 Yin Kangkai +- Update systemd user session services. + * Wed Jun 26 2013 Maciej Wereski - Use UID instead of username vars in paths diff --git a/packaging/tizen-mobile-session.spec b/packaging/tizen-mobile-session.spec index a7bf0a8..44c011a 100644 --- a/packaging/tizen-mobile-session.spec +++ b/packaging/tizen-mobile-session.spec @@ -1,13 +1,12 @@ %bcond_with emulator Name: tizen-mobile-session Summary: Target for tizen systemd user session -Version: 1 +Version: 2 Release: 2 Group: System/Libraries License: Public Domain Source0: tizen-mobile-session.target Source1: tizen-middleware.target -Source2: user-session@.service.in Source4: tizen-generate-env.service Requires: systemd @@ -25,23 +24,7 @@ install -m 0644 %SOURCE0 %{buildroot}%{_libdir}/systemd/user/ install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/user/ install -m 0644 %SOURCE4 %{buildroot}%{_libdir}/systemd/system/ -SERVICE_OPTIONS= -UNIT_OPTIONS= -%if %{with emulator} -SERVICE_OPTIONS=TimeoutStartSec=0 -%endif -sed -e "/@service_options@/ { - s/@service_options@/$SERVICE_OPTIONS/ - /^\$/d - } - /@unit_options@/ { - s/@unit_options@/$UNIT_OPTIONS/ - /^\$/d - }" \ - %SOURCE2 > ./user-session@.service -install -m 0644 user-session@.service %{buildroot}%{_libdir}/systemd/system/ - -ln -sf ../user-session@.service %{buildroot}%{_libdir}/systemd/system/graphical.target.wants/user-session@app.service +ln -sf ../user-session-launch@.service %{buildroot}%{_libdir}/systemd/system/graphical.target.wants/user-session@seat0-5000.service ln -sf tizen-mobile-session.target %{buildroot}%{_libdir}/systemd/user/default.target ln -sf ../tizen-generate-env.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants @@ -56,7 +39,6 @@ ln -sf /run/tizen-mobile-ui %{buildroot}%{_sysconfdir}/sysconfig/tizen-mobile-ui %{_libdir}/systemd/user/tizen-mobile-session.target.wants/ %{_libdir}/systemd/user/tizen-middleware.target.wants/ %{_libdir}/systemd/user/default.target -%{_libdir}/systemd/system/graphical.target.wants/user-session@app.service -%{_libdir}/systemd/system/user-session@.service +%{_libdir}/systemd/system/graphical.target.wants/user-session-launch@seat0-5000.service %{_libdir}/systemd/system/tizen-generate-env.service %{_libdir}/systemd/system/basic.target.wants/tizen-generate-env.service -- cgit v1.2.3