[voicecall] voicecall-manager.service uses new boot targets

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

rpm/voicecall-qt5.spec

@@ -17,6 +17,8 @@ URL:        http://github.com/nemomobile/voicecall
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  voicecall-qt5.yaml
 Requires:   telepathy-ring
+Requires:   systemd
+Requires:   systemd-user-session-targets
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(Qt5Qml)
@@ -99,11 +101,27 @@ rm -rf %{buildroot}
 %qmake_install
 
 # >> install post
+mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
+ln -s ../voicecall-manager.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
 # << install post
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+# >> post
+if [ "$1" -ge 1 ]; then
+systemctl-user daemon-reload || :
+systemctl-user restart voicecall-manager.service || :
+fi
+# << post
+
+%postun
+/sbin/ldconfig
+# >> postun
+if [ "$1" -eq 0 ]; then
+systemctl-user stop voicecall-manager.service || :
+systemctl-user daemon-reload || :
+fi
+# << postun
 
 %files
 %defattr(-,root,root,-)
@@ -119,6 +137,7 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/xdg/autostart/voicecall-manager.desktop
 %{_libdir}/systemd/user/voicecall-manager.service
 # >> files
+%{_libdir}/systemd/user/user-session.target.wants/voicecall-manager.service
 # << files
 
 %files devel

rpm/voicecall-qt5.yaml

@@ -21,6 +21,8 @@ PkgConfigBR:
 Builder: qmake5
 Requires:
     - telepathy-ring
+    - systemd
+    - systemd-user-session-targets
 Files:
     - "%{_libdir}/libvoicecall.so.1"
     - "%{_libdir}/libvoicecall.so.1.0"

src/voicecall-manager.service

@@ -1,7 +1,11 @@
 [Unit]
 Description=Voicecall manager
 Requires=dbus.socket ngfd.service tone-generator.service
+After=pre-user-session.target
 
 [Service]
 ExecStart=/usr/bin/voicecall-manager
 Restart=always
+
+[Install]
+WantedBy=user-session.target