rpms/monit/EL-6 .cvsignore, 1.3, 1.4 monit-no-startup-msg.patch, 1.1, 1.2 monit.spec, 1.11, 1.12 sources, 1.3, 1.4

[Maxim Burgerhout]

Author: wzzrd

Update of /cvs/pkgs/rpms/monit/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv822

Modified Files:
	.cvsignore monit-no-startup-msg.patch monit.spec sources 
Log Message:
- Version bump to 5.1.1 (needed new version of monit-no-startup-msg.patch)
- Ghosted the logfile




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monit/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Aug 2009 19:28:03 -0000	1.3
+++ .cvsignore	5 Jul 2010 19:29:08 -0000	1.4
@@ -1 +1 @@
-monit-5.0.3.tar.gz
+monit-5.1.1.tar.gz

monit-no-startup-msg.patch:
 monitor.c |    4 ----
 1 file changed, 4 deletions(-)

Index: monit-no-startup-msg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monit/EL-6/monit-no-startup-msg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monit-no-startup-msg.patch	23 Dec 2008 03:09:20 -0000	1.1
+++ monit-no-startup-msg.patch	5 Jul 2010 19:29:08 -0000	1.2
@@ -1,15 +1,13 @@
---- monitor.c.nomsg	2007-07-29 16:23:26.000000000 -0400
-+++ monitor.c	2008-12-22 21:49:36.000000000 -0500
-@@ -459,12 +459,6 @@
+--- monitor.c.nomsg	2010-07-05 19:16:34.337850714 +0200
++++ monitor.c	2010-07-05 19:17:19.821070156 +0200
+@@ -482,10 +482,6 @@ static void do_default() {
+       exit(0);
    
-     Run.once= FALSE;
- 
--    if(can_http())
--      LogInfo("Starting %s daemon with http interface at [%s:%d]\n",
--          prog, Run.bind_addr?Run.bind_addr:"*", Run.httpdport);
+     Run.once = FALSE;
+-    if (can_http())
+-      LogInfo("Starting %s daemon with http interface at [%s:%d]\n", prog, Run.bind_addr?Run.bind_addr:"*", Run.httpdport);
 -    else
 -      LogInfo("Starting %s daemon\n", prog);
--    
-     if(Run.init != TRUE)
-       daemonize(); 
      
+     if (Run.startdelay)
+         LogInfo("Monit start delay set -- pause for %ds\n", Run.startdelay);


Index: monit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monit/EL-6/monit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- monit.spec	21 Aug 2009 14:32:14 -0000	1.11
+++ monit.spec	5 Jul 2010 19:29:08 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           monit
-Version:        5.0.3
-Release:        2%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        Manages and monitors processes, files, directories and devices
 
 Group:          Applications/Internet
@@ -33,11 +33,9 @@ and can execute meaningful causal action
 %patch1 -b .nomsg
 
 %build
-%configure \
-    --disable-static
+%configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -85,17 +83,21 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE PLATFORMS README README.DEVELOPER README.SSL
+%doc CHANGES.txt COPYING LICENSE PLATFORMS README README.DEVELOPER README.SSL
 %config(noreplace) %{_sysconfdir}/monit.conf
 %config(noreplace) %{_sysconfdir}/monit.d/logging
 %config(noreplace) %{_sysconfdir}/logrotate.d/monit
-%{_localstatedir}/log/monit
+%ghost %{_localstatedir}/log/monit
 %{_sysconfdir}/monit.d/
 %{_initrddir}/monit
 %{_bindir}/%{name}
 %{_mandir}/man1/monit.1*
 
 %changelog
+* Mon Jul 05 2010 Maxim Burgerhout <wzzrd at fedoraproject.org> - 5.1.1-1
+- Version bump to 5.1.1 (needed new version of monit-no-startup-msg.patch)
+- Ghosted the logfile
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.3-2
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monit/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Aug 2009 19:28:04 -0000	1.3
+++ sources	5 Jul 2010 19:29:08 -0000	1.4
@@ -1 +1 @@
-dae7859ec10551fc941daeae60dee9d3  monit-5.0.3.tar.gz
+4bbd3845ae1cbab13ec211824e0486dc  monit-5.1.1.tar.gz