From fbe13a0f5425ec7b99f8a79fd4f45396c3bb09de Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Mar 14 2017 18:14:42 +0000
Subject: systemd cleanup


---

diff --git a/babeld.spec b/babeld.spec
index d9b5553..432d8f3 100644
--- a/babeld.spec
+++ b/babeld.spec
@@ -2,7 +2,7 @@
 
 Name:           babeld
 Version:        1.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Ad-hoc network routing daemon
 
 Group:          System Environment/Base
@@ -13,9 +13,6 @@ Source1:        %{name}.service
 Source2:        %{name}.conf
 Source3:        %{name}.logrotate
 BuildRequires:	systemd
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
 Conflicts:      quagga
 
 %description
@@ -39,24 +36,13 @@ mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/
 install -Dp -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/babeld
 
 %post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post babeld.service
   
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
-    /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
-fi
+%systemd_preun babeld.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart babeld.service
 
 
 %files
@@ -71,6 +57,9 @@ fi
 
 
 %changelog
+* Tue Mar 14 2017 Jon Ciesla <limburgher@gmail.com> - 1.8.0-3
+- systemd cleanup
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild