From eca3eefb0f129cc83c5d7ab87bc31d1c0c4ad3fe Mon Sep 17 00:00:00 2001
From: Matti Kosola <matti.kosola@jolla.com>
Date: Wed, 10 Dec 2014 17:44:46 +0200
Subject: [PATCH] [systemd] Start sensord in graphical target instead of basic.
 Contributes to JB#20442

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
---
 rpm/sensord.service   |  9 +++++----
 rpm/sensorfw-qt5.spec | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/rpm/sensord.service b/rpm/sensord.service
index 1d9a6627..142ea97a 100644
--- a/rpm/sensord.service
+++ b/rpm/sensord.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=Sensor daemon for sensor framework
-After=boardname.service
-Requires=dbus.socket
+After=dbus.socket
+Requires=dbus.service
 Conflicts=actdead.target
 
 [Service]
-Type=forking 
+Type=forking
+BusName=com.nokia.SensorService
 ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
 ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-level=warning --no-magnetometer-bg-calibration
 ExecReload=/bin/kill -HUP $MAINPID
@@ -13,5 +14,5 @@ Restart=always
 RestartSec=1
 
 [Install]
-WantedBy=basic.target
+WantedBy=graphical.target
 
diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
index 574e52dd..fcda1d1d 100644
--- a/rpm/sensorfw-qt5.spec
+++ b/rpm/sensorfw-qt5.spec
@@ -22,6 +22,7 @@ BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(mlite5)
+BuildRequires:  systemd
 Provides:   sensord-qt5
 Obsoletes:   sensorframework
 
@@ -91,11 +92,11 @@ rm -rf %{buildroot}
 export QT_SELECT=5
 %qmake5_install
 
-install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_lib}/systemd/system/sensord.service
+install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/sensord.service
 install -D -m750 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/sensord-daemon-conf-setup
 
-mkdir -p %{buildroot}/%{_lib}/systemd/system/basic.target.wants
-ln -s ../sensord.service %{buildroot}/%{_lib}/systemd/system/basic.target.wants/sensord.service
+mkdir -p %{buildroot}/%{_unitdir}/graphical.target.wants
+ln -s ../sensord.service %{buildroot}/%{_unitdir}/graphical.target.wants/sensord.service
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -127,8 +128,8 @@ systemctl daemon-reload || :
 %config %{_sysconfdir}/dbus-1/system.d/sensorfw.conf
 %config %{_sysconfdir}/sensorfw/sensord.conf
 %dir %{_sysconfdir}/sensorfw/sensord.conf.d/
-/%{_lib}/systemd/system/sensord.service
-/%{_lib}/systemd/system/basic.target.wants/sensord.service
+%{_unitdir}/sensord.service
+%{_unitdir}/graphical.target.wants/sensord.service
 %{_bindir}/sensord-daemon-conf-setup
 
 %files devel