diff --git a/monit-sysv-initscript b/monit-sysv-initscript index 68a9a69..af7ad49 100644 --- a/monit-sysv-initscript +++ b/monit-sysv-initscript @@ -8,7 +8,7 @@ # description: This starts the Monit system monitor # # processname: monit -# config: %{_sysconfdir}/monit.conf +# config: /etc/monit.conf # pidfile: /var/run/monit # Short-Description: Monit system monitor @@ -18,12 +18,12 @@ # FIXME: Should we also use /var/run/${prog}.pid? ### Default variables -CONFIG="%{_sysconfdir}/monit.conf" +CONFIG="/etc/monit.conf" prog="monit" desc="process monitor" # Check if requirements are met -[ -x %{_bindir}/monit ] || exit 1 +[ -x /usr/bin/monit ] || exit 1 [ -r "$CONFIG" ] || exit 1 RETVAL=0 diff --git a/monit.spec b/monit.spec index d204b07..e317094 100644 --- a/monit.spec +++ b/monit.spec @@ -1,6 +1,6 @@ Name: monit Version: 4.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manages and monitors processes, files, directories and devices Group: Applications/Internet @@ -72,6 +72,9 @@ fi %{_bindir}/%{name} %changelog +* Sat Nov 24 2007 Stewart Adam 4.10.1-4 +- Substitute RPM macros for their real values in monit.conf (#397671) + * Tue Nov 13 2007 Stewart Adam 4.10.1-3 - Bump - Fix changelog date for previous entry