[boot] service file uses new boot targets

Signed-off-by: Pekka Lundstrom <pekka.lundstrom@jollamobile.com>

contactsd.service

@@ -1,9 +1,10 @@
 [Unit]
 Description=Contacts daemon
-After=xorg.target
-Requires=dbus.socket xorg.target
+After=pre-user-session.target
+Requires=dbus.socket
 
 [Service]
 ExecStart=/usr/bin/contactsd
 
-
+[Install]
+WantedBy=user-session.target

rpm/contactsd.spec

@@ -6,6 +6,8 @@ Group: System/Libraries
 URL: https://github.com/nemomobile/contactsd
 License: LGPLv2
 Source0: %{name}-%{version}.tar.bz2
+Requires: systemd
+Requires: systemd-user-session-targets
 BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: pkgconfig(Qt5DBus)
 BuildRequires: pkgconfig(Qt5Network)
@@ -27,6 +29,7 @@ information), and store it to QtContacts.
 %files
 %defattr(-,root,root,-)
 %{_libdir}/systemd/user/contactsd.service
+%{_libdir}/systemd/user/user-session.target.wants/contactsd.service
 %{_bindir}/contactsd
 %{_libdir}/contactsd-1.0/plugins/*.so
 # we currently don't have a backup framework
@@ -74,3 +77,18 @@ make %{?_smp_mflags}
 %install
 make INSTALL_ROOT=%{buildroot} install
 
+mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants  
+ln -s ../contactsd.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
+
+%post
+if [ "$1" -ge 1 ]; then
+systemctl-user daemon-reload || :
+systemctl-user restart contactsd.service || :
+fi
+
+%postun
+if [ "$1" -eq 0 ]; then
+systemctl-user stop contactsd.service || :
+systemctl-user daemon-reload || :
+fi
+