Revert "Remove service so as to be launched by starter"

This reverts commit fe055412b5054da931a05c123314f500f4b8721c.

Change-Id: I1c497bddebad96a15031aa711e982ace9da62b7d

diff --git a/packaging/indicator.service b/packaging/indicator.service
new file mode 100644 (file)
index 0000000..4d9133c
--- /dev/null
+++ b/packaging/indicator.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Start the indicator
+After=starter.service wm_ready.service smack-default-labeling.service
+Requires=starter.service
+
+[Service]
+ExecStart=/usr/apps/org.tizen.indicator/bin/indicator
+KillSignal=SIGKILL
+
+[Install]
+WantedBy=multi-user.target
+

diff --git a/packaging/indicator.service.system b/packaging/indicator.service.system
new file mode 100644 (file)
index 0000000..036ebc4
--- /dev/null
+++ b/packaging/indicator.service.system
@@ -0,0 +1,15 @@
+[Unit]
+Description=Start the indicator
+Requires=ac.service
+After=launchpad-preload.service wm_ready.service ac.service
+
+[Service]
+EnvironmentFile=/run/tizen-system-env
+#ExecStart=/usr/apps/org.tizen.indicator/bin/indicator
+ExecStart=/usr/bin/app_launcher -s org.tizen.indicator __LAUNCH_APP_MODE__ SYNC
+Restart=always
+RestartSec=0
+OOMScoreAdjust=200
+
+[Install]
+WantedBy=multi-user.target

diff --git a/packaging/org.tizen.indicator.spec b/packaging/org.tizen.indicator.spec
index ac3f7be..6fc2e2f 100644 (file)
--- a/packaging/org.tizen.indicator.spec
+++ b/packaging/org.tizen.indicator.spec
@@ -10,6 +10,8 @@ Release:    1
 Group:      utils
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
+Source1:    indicator.service.system
+Source2:    indicator.path
 
 %if "%{?profile}" == "wearable"
 ExcludeArch: %{arm} %ix86 x86_64
@@ -98,6 +100,11 @@ cp -f LICENSE %{buildroot}/usr/share/license/%{PKGNAME}
 %define tizen_author_sign 1
 %define tizen_dist_sign 1
 
+mkdir -p %{buildroot}/usr/lib/systemd/user/default.target.wants
+install -m 0644 %SOURCE1 %{buildroot}/usr/lib/systemd/user/indicator.service
+install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/user/indicator.path
+ln -s ../indicator.path %{buildroot}/usr/lib/systemd/user/default.target.wants/
+
 %clean
 rm -rf %{buildroot}
 
@@ -114,6 +121,9 @@ rm -rf %{buildroot}
 /usr/share/packages/%{PKGNAME}.xml
 %attr(775,app,app) %{PREFIXRW}/data
 %attr(755,-,-) %{_sysconfdir}/init.d/indicator
+/usr/lib/systemd/user/indicator.service
+/usr/lib/systemd/user/default.target.wants/indicator.path
+/usr/lib/systemd/user/indicator.path
 /usr/share/license/%{PKGNAME}
 /usr/apps/%{PKGNAME}/author-signature.xml
 /usr/apps/%{PKGNAME}/signature1.xml