[libcanberra/f18] Use systemd macros

Lennart Poettering lennart at fedoraproject.org
Fri Sep 14 16:05:22 UTC 2012


commit 12c04506c0e0f94dc437d902571c4effd66390d8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Sep 14 18:03:14 2012 +0200

    Use systemd macros

 libcanberra.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/libcanberra.spec b/libcanberra.spec
index c653b50..d69c26d 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.29
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -57,19 +57,14 @@ Development Files for libcanberra Client Development
 
 %post
 /sbin/ldconfig
-if [ $1 -eq 1 ]; then
-        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %preun
-if [ $1 -eq 0 ]; then
-        /bin/systemctl --no-reload disable canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || :
-        /bin/systemctl stop canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service >/dev/null 2>&1 || :
-fi
+%systemd_preun canberra-system-bootup.service canberra-system-shutdown.service canberra-system-shutdown-reboot.service
 
 %postun
 /sbin/ldconfig
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%systemd_postun
 
 %post gtk2 -p /sbin/ldconfig
 %postun gtk2 -p /sbin/ldconfig
@@ -145,6 +140,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Fri Sep 14 2012 Lennart Poettering <lpoetter at redhat.com> - 0.29-5
+- Use systemd macros
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.29-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list