[speech-dispatcher/f19] Revert "Update the systemd scriptlets to the macroized versions"
Peter Robinson
pbrobinson at fedoraproject.org
Wed Mar 20 13:31:27 UTC 2013
commit 5ff04f7461373d663982357cedfd364c1646a1e5
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Wed Mar 20 13:30:36 2013 +0000
Revert "Update the systemd scriptlets to the macroized versions"
This reverts commit 8d330f4d76a669a152bbc6498c99e842377eff51.
speech-dispatcher.spec | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index a39619f..6d5a0a4 100644
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@ -28,9 +28,9 @@ Patch0: 0001-RPM-Cleanups.patch
# Backported Python 3 suppor from speech-dispatcher-0.8-beta1.tar.gz
Patch1: speech-dispatcher-python3.patch
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
%ifnarch s390 s390x
BuildRequires: libraw1394
@@ -145,14 +145,26 @@ mv %{buildroot}%{_datadir}/speech-dispatcher/conf/modules/* %{buildroot}%{_sysco
%post
/sbin/ldconfig
-%systemd_post speech-dispatcherd.service
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
%postun
/sbin/ldconfig
-%systemd_postun_with_restart speech-dispatcherd.service
+
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart speech-dispatcherd.service >/dev/null 2>&1 || :
+fi
%preun
-%systemd_preun speech-dispatcherd.service
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable speech-dispatcherd.service > /dev/null 2>&1 || :
+ /bin/systemctl stop speech-dispatcherd.service > /dev/null 2>&1 || :
+fi
%files
%doc AUTHORS ChangeLog NEWS README COPYING
@@ -209,7 +221,6 @@ fi
distros
- Backport Python 3 bindings from 0.8-beta1 and install them in python3-speechd
subpackage (#867958)
-- Update the systemd scriptlets to the macroized versions
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list