[wicd] Use new systemd macros in trigger scripts (#850367)

[David Cantrell]

commit 8def0d7bbec9ab0c596d58ce04dd2e53a59b90f4
Author: David Cantrell <dcantrell at redhat.com>
Date:   Tue Oct 23 10:20:03 2012 -0400

    Use new systemd macros in trigger scripts (#850367)

 wicd.spec |   30 ++++++++++--------------------
 1 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/wicd.spec b/wicd.spec
index 80b2cf4..b54fcca 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.2.4
-Release:             2%{?dist}
+Release:             3%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -162,29 +162,13 @@ desktop-file-install \
 rm -rf %{buildroot}
 
 %post common
-if [ $1 -eq 1 ]; then
-    # Package install, not upgrade
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post wicd.service
 
 %preun common
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl disable wicd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop wicd.service > /dev/null 2>&1 || :
-fi
+%systemd_preun wicd.service
 
 %postun common
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart wicd.service >/dev/null 2>&1 || :
-fi
-
-%triggerun -- wicd-common < 1.7.0-5
-if /sbin/chkconfig --level 3 wicd ; then
-    /bin/systemctl enable wicd.service >/dev/null 2>&1 || :
-fi
+%systemd_post_with_restart wicd.service
 
 %post gtk
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -287,6 +271,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Tue Oct 23 2012 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-3
+- Use new systemd macros in trigger scripts (#850367)
+
+* Thu Aug 02 2012 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-2
+- Updated duplicate logrotate file fix (#820139)
+
 * Thu Aug 02 2012 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-1
 - Upgrade to wicd-1.7.2.4
 - Remove duplicate logrotate file (#820139)