[monit] Upgrading to new upstream release 5.6

[Maxim Burgerhout]

commit 39e7359aa2823ead8729207efe587a783d4dc8cd
Author: Maxim Burgerhout <maxim at wzzrd.com>
Date:   Wed Dec 4 14:13:40 2013 +0100

    Upgrading to new upstream release 5.6

 .gitignore |    1 +
 monit.spec |   33 ++++++++++++++-------------------
 sources    |    2 +-
 3 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 76d932b..1cf96c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ monit-5.1.1.tar.gz
 /monit-5.2.3.tar.gz
 /monit-5.2.5.tar.gz
 /monit-5.3.1.tar.gz
+/monit-5.6.tar.gz
diff --git a/monit.spec b/monit.spec
index 7bb137d..0ccc755 100644
--- a/monit.spec
+++ b/monit.spec
@@ -1,12 +1,12 @@
 Name:           monit
-Version:        5.3.1
-Release:        6%{?dist}
+Version:        5.6
+Release:        1%{?dist}
 Summary:        Manages and monitors processes, files, directories and devices
 
 Group:          Applications/Internet
 License:        AGPLv3
-URL:            http://www.tildeslash.com/monit
-Source0:        http://www.tildeslash.com/monit/dist/monit-%{version}.tar.gz
+URL:            http://mmonit.com/monit/
+Source0:        http://mmonit.com/monit/dist/%{name}-%{version}.tar.gz
 Source2:        monit.logrotate
 Source3:        monit.service
 Source4:        monit-logging-conf
@@ -16,12 +16,12 @@ BuildRequires: flex
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
 BuildRequires: byacc
-BuildRequires: systemd-units
+BuildRequires: systemd
 
-Requires(post): systemd-units
 Requires(post): systemd-sysv
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 
 %description
@@ -67,9 +67,7 @@ install -p -D -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/logging
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ $1 -eq 1 ]; then
-    /bin/systemctl enable monit.service > /dev/null 2>&1 || :
-fi
+%systemd_post monit.service
 
 # Moving old style configuration file to upstream's default location
 [ -f %{_sysconfdir}/monit.conf ] &&
@@ -77,16 +75,10 @@ fi
     mv -f %{_sysconfdir}/monit.conf %{_sysconfdir}/monitrc 2> /dev/null || :
 
 %preun
-if [ $1 -eq 0 ]; then
-    /bin/systemctl --no-reload disable monit.service > /dev/null 2>&1 || :
-    /bin/systemctl stop monit.service > /dev/null 2>&1 || :
-fi
+%systemd_preun monit.service
 
 %postun
-/bin/systemctl daemon-reload > /dev/null 2>&1 || :
-if [ $1 -ge 1 ]; then
-    /bin/systemctl try-restart monit.service > /dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart monit.service
 
 %triggerun -- monit < 5.3.1-1
 /usr/bin/systemd-sysv-convert --save monit > /dev/null 2>&1 || :
@@ -108,6 +100,9 @@ fi
 
 
 %changelog
+* Wed Dec 04 2013 Maxim Burgerhout <maxim at wzzrd.com> - 5.6.0-1
+- Upgrading to new upstream release 5.6.0
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index b7e2c56..5e67ae3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e97eac9750f68945ca860028d9ef0f3  monit-5.3.1.tar.gz
+19dfc1ce8512e832134d06eedd96ba50  monit-5.6.tar.gz