Change ID: c784ac023826f2a1734e5d7af7ae8e6cc78acdc7

merge changes from gerrit review 1624

diff --combined packaging/ofono.spec
index 13aec3d,792d0b3..dd77df3
--- 1/packaging/ofono.spec
--- 2/packaging/ofono.spec
+++ b/packaging/ofono.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       ofono
  Summary:    Open Source Telephony
 -Version:    1.6
 +Version:    1.8
  Release:    6
  Group:      Communications/Connectivity Adaptation
  License:    GPLv2
@@@ -62,13 -62,15 +62,15 @@@ make %{?jobs:-j%jobs
  mkdir -p %{buildroot}/usr/lib/systemd/system/network.target.wants
  ln -s ../ofono.service %{buildroot}/usr/lib/systemd/system/network.target.wants/ofono.service
  
- mkdir -p %{buildroot}/etc/rc.d/init.d
- cp %{SOURCE1} %{buildroot}/etc/rc.d/init.d/ofono
- chmod +x %{buildroot}/etc/rc.d/init.d/ofono
- 
  %post
- ln -sf ../init.d/ofono /etc/rc.d/rc3.d/S61ofono
- ln -sf ../init.d/ofono /etc/rc.d/rc5.d/S61ofono
+ systemctl daemon-reload
+ systemctl restart ofono.service
+ 
+ %preun
+ systemctl stop ofono.service
+ 
+ %postun
+ systemctl daemon-reload
  
  %docs_package
  
@@@ -78,7 -80,6 +80,6 @@@
  /usr/lib/systemd/system/network.target.wants/ofono.service
  /usr/lib/systemd/system/ofono.service
  /etc/ofono/phonesim.conf
- /etc/rc.d/init.d/*
  
  %files devel
  %{_includedir}/ofono/*.h