Add dependency, set BuildArch, RPMLINT fixes, cleanupHEADtizen

Also add default SMACK manifest.

Change-Id: I1e4a3c6cb7a539344dafbdd25ac0e7c80ae0b25a
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>

4 files changed, 48 insertions, 48 deletions

diff --git a/packaging/tizen-mobile-session.changes b/packaging/tizen-mobile-session.changes
index 9a710b4..282ba55 100644
--- a/packaging/tizen-mobile-session.changes
+++ b/packaging/tizen-mobile-session.changes
@@ -1,3 +1,6 @@
+* Fri Jan 10 2014 Maciej Wereski <m.wereski@partner.samsung.com> accepted/tizen/mobile/20140108.162700@3314f4d
+- Add dependency, set BuildArch, RPMLINT fixes, cleanup
+
 * Tue Jan 07 2014 Yin Kangkai <kangkai.yin@intel.com>
 - Update systemd user session services.
 
diff --git a/packaging/tizen-mobile-session.manifest b/packaging/tizen-mobile-session.manifest
new file mode 100644
index 0000000..25a298e
--- /dev/null
+++ b/packaging/tizen-mobile-session.manifest
@@ -0,0 +1,5 @@
+<manifest>
+  <request>
+      <domain name="_"/>
+   </request>
+</manifest>
diff --git a/packaging/tizen-mobile-session.spec b/packaging/tizen-mobile-session.spec
index 8d4e50f..af0501f 100644
--- a/packaging/tizen-mobile-session.spec
+++ b/packaging/tizen-mobile-session.spec
@@ -1,53 +1,69 @@
 %bcond_with emulator
 %bcond_with x
 Name:       tizen-mobile-session
-Summary:    Target for tizen systemd user session
+Summary:    Tizen systemd user session
 Version:    2
 Release:    2
+BuildArch:  noarch
 Group:      System/Libraries
-License:    Public Domain
+License:    TIZEN-Public-Domain
 Source0:    tizen-mobile-session.target
 Source1:    tizen-middleware.target
 Source4:    tizen-generate-env.service
 Source5:    tizen-mobile-env.conf
+Source6:    tizen-mobile-session.manifest
 
 Requires: systemd
+Requires: user-session-units
 
 %description
-Target for tizen systemd user session
+Target for Tizen systemd user session
+
+%prep
+cp %{SOURCE6} .
+
+%build
 
 %install
 
-mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-mobile-session.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/system/graphical.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/system/user@.service.d
-install -m 0644 %SOURCE0 %{buildroot}%{_libdir}/systemd/user/
-install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/user/
-install -m 0644 %SOURCE4 %{buildroot}%{_libdir}/systemd/system/
-install -m 0644 %SOURCE5 %{buildroot}%{_libdir}/systemd/system/user@.service.d/
+mkdir -p %{buildroot}%{_unitdir_user}/tizen-mobile-session.target.wants
+mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
+mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants
+mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
+mkdir -p %{buildroot}%{_unitdir}/user@.service.d
+install -m 0644 %SOURCE0 %{buildroot}%{_unitdir_user}
+install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}
+install -m 0644 %SOURCE4 %{buildroot}%{_unitdir}
+install -m 0644 %SOURCE5 %{buildroot}%{_unitdir}/user@.service.d/
 
 %if %{with x}
 echo "Environment=DISPLAY=:0" >> %{buildroot}%{_libdir}/systemd/system/user@.service.d/tizen-mobile-env.conf
 %endif
 
-ln -sf ../user-session-launch@.service %{buildroot}%{_libdir}/systemd/system/graphical.target.wants/user-session-launch@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
+ln -sf ../user-session-launch@.service %{buildroot}%{_unitdir}/graphical.target.wants/user-session-launch@seat0-5000.service
+ln -sf tizen-mobile-session.target %{buildroot}%{_unitdir_user}/default.target
+ln -sf ../tizen-generate-env.service %{buildroot}%{_unitdir}/basic.target.wants
 
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 ln -sf /run/tizen-mobile-ui %{buildroot}%{_sysconfdir}/sysconfig/tizen-mobile-ui
 
+%post
+/usr/bin/systemctl daemon-reload
+/usr/bin/systemctl start tizen-generate-env.service
+
+%postun
+/usr/bin/systemctl daemon-reload
 
 %files
+%manifest tizen-mobile-session.manifest
 %config %{_sysconfdir}/sysconfig/tizen-mobile-ui
-%{_libdir}/systemd/user/tizen-mobile-session.target
-%{_libdir}/systemd/user/tizen-middleware.target
-%{_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-launch@seat0-5000.service
-%{_libdir}/systemd/system/tizen-generate-env.service
-%{_libdir}/systemd/system/basic.target.wants/tizen-generate-env.service
-%{_libdir}/systemd/system/user@.service.d/tizen-mobile-env.conf
+%{_unitdir_user}/tizen-mobile-session.target
+%{_unitdir_user}/tizen-middleware.target
+%{_unitdir_user}/tizen-mobile-session.target.wants/
+%{_unitdir_user}/tizen-middleware.target.wants/
+%{_unitdir_user}/default.target
+%{_unitdir}/graphical.target.wants/user-session-launch@seat0-5000.service
+%{_unitdir}/tizen-generate-env.service
+%{_unitdir}/basic.target.wants/tizen-generate-env.service
+%{_unitdir}/user@.service.d/tizen-mobile-env.conf
+%ghost /run/tizen-mobile-ui
diff --git a/packaging/user-session@.service.in b/packaging/user-session@.service.in
deleted file mode 100644
index b9646fa..0000000
--- a/packaging/user-session@.service.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=User Manager for %I
-After=systemd-user-sessions.service dbus.service
-@unit_options@
-
-[Service]
-User=%I
-PAMName=login
-ControlGroup=%R/user/%U.user/shared cpu:/
-ControlGroupModify=yes
-Type=notify
-ExecStart=-/usr/lib/systemd/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
-Environment=DISPLAY=:0
-Environment=XDG_RUNTIME_DIR=/run/user/%U
-EnvironmentFile=/etc/sysconfig/tizen-mobile-ui
-@service_options@