summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraydon, Tracy <tracy.graydon@intel.com>2012-09-13 10:42:36 -0700
committerGraydon, Tracy <tracy.graydon@intel.com>2012-09-13 10:55:37 -0700
commit3bf8f8e3b2b6762241bb382afcd4431d2ca2200a (patch)
treee0891a1c16890f658c0b204d0aaae187b998f385
parent73ee227dcd365e0c9895dabe0faf63ea4d3c9016 (diff)
parentc784ac023826f2a1734e5d7af7ae8e6cc78acdc7 (diff)
downloadofono-3bf8f8e3b2b6762241bb382afcd4431d2ca2200a.tar.gz
ofono-3bf8f8e3b2b6762241bb382afcd4431d2ca2200a.tar.bz2
ofono-3bf8f8e3b2b6762241bb382afcd4431d2ca2200a.zip
Change ID: c784ac023826f2a1734e5d7af7ae8e6cc78acdc7submit/trunk/20120913.175641
merge changes from gerrit review 1624
-rw-r--r--packaging/ofono.spec15
1 files changed, 8 insertions, 7 deletions
diff --git a/packaging/ofono.spec b/packaging/ofono.spec
index 13aec3d..dd77df3 100644
--- a/packaging/ofono.spec
+++ b/packaging/ofono.spec
@@ -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