[speech-dispatcher/f19] Update the systemd scriptlets to the macroized versions
Kalev Lember
kalev at fedoraproject.org
Wed Mar 20 12:17:31 UTC 2013
commit 8d330f4d76a669a152bbc6498c99e842377eff51
Author: Kalev Lember <kalevlember at gmail.com>
Date: Wed Feb 27 13:10:45 2013 +0100
Update the systemd scriptlets to the macroized versions
speech-dispatcher.spec | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index 6d5a0a4..a39619f 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-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%ifnarch s390 s390x
BuildRequires: libraw1394
@@ -145,26 +145,14 @@ mv %{buildroot}%{_datadir}/speech-dispatcher/conf/modules/* %{buildroot}%{_sysco
%post
/sbin/ldconfig
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post speech-dispatcherd.service
%postun
/sbin/ldconfig
-
-/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
+%systemd_postun_with_restart speech-dispatcherd.service
%preun
-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
+%systemd_preun speech-dispatcherd.service
%files
%doc AUTHORS ChangeLog NEWS README COPYING
@@ -221,6 +209,7 @@ 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