Change ID: c784ac023826f2a1734e5d7af7ae8e6cc78acdc7 26/1726/1 submit/trunk/20120913.175641
authorGraydon, Tracy <tracy.graydon@intel.com>
Thu, 13 Sep 2012 17:42:36 +0000 (10:42 -0700)
committerGraydon, Tracy <tracy.graydon@intel.com>
Thu, 13 Sep 2012 17:55:37 +0000 (10:55 -0700)
merge changes from gerrit review 1624

packaging/ofono.spec

index 13aec3d..dd77df3 100644 (file)
@@ -62,13 +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 @@ ln -sf ../init.d/ofono /etc/rc.d/rc5.d/S61ofono
 /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