rpms/monit/F-8 monit.spec,1.1,1.2 monit-sysv-initscript,1.1,1.2

[Stewart Adam (firewing)]

Author: firewing

Update of /cvs/extras/rpms/monit/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32754/F-8

Modified Files:
	monit.spec monit-sysv-initscript 
Log Message:
- Substitute RPM macros for their real values in monit.conf (#397671)



Index: monit.spec
===================================================================
RCS file: /cvs/extras/rpms/monit/F-8/monit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monit.spec	13 Nov 2007 23:54:21 -0000	1.1
+++ monit.spec	24 Nov 2007 13:56:24 -0000	1.2
@@ -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 @@
 %{_bindir}/%{name}
 
 %changelog
+* Sat Nov 24 2007 Stewart Adam <s.adam at diffingo.com> 4.10.1-4
+- Substitute RPM macros for their real values in monit.conf (#397671)
+
 * Tue Nov 13 2007 Stewart Adam <s.adam at diffingo.com> 4.10.1-3
 - Bump
 - Fix changelog date for previous entry


Index: monit-sysv-initscript
===================================================================
RCS file: /cvs/extras/rpms/monit/F-8/monit-sysv-initscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monit-sysv-initscript	13 Nov 2007 23:54:21 -0000	1.1
+++ monit-sysv-initscript	24 Nov 2007 13:56:24 -0000	1.2
@@ -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