rpms/nagios/devel .cvsignore, 1.15, 1.16 nagios-initrd.patch, 1.1, 1.2 nagios.spec, 1.59, 1.60 sources, 1.16, 1.17

[Robert M. Albrecht]

Author: romal

Update of /cvs/pkgs/rpms/nagios/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1468

Modified Files:
	.cvsignore nagios-initrd.patch nagios.spec sources 
Log Message:
upstream released 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 Jul 2008 15:14:09 -0000	1.15
+++ .cvsignore	20 Oct 2008 07:03:07 -0000	1.16
@@ -1 +1 @@
-nagios-3.0.3.tar.gz
+nagios-3.0.4.tar.gz

nagios-initrd.patch:

Index: nagios-initrd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios-initrd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagios-initrd.patch	9 May 2006 23:25:13 -0000	1.1
+++ nagios-initrd.patch	20 Oct 2008 07:03:07 -0000	1.2
@@ -1,7 +1,7 @@
---- nagios	2006-05-08 10:39:49.000000000 -0300
-+++ daemon-init.in	2006-05-08 10:33:26.000000000 -0300
-@@ -114,11 +114,13 @@
- 		echo "Starting network monitor: nagios"
+--- daemon-init.in.orig	2008-10-20 08:40:35.000000000 +0200
++++ daemon-init.in	2008-10-20 08:41:15.000000000 +0200
+@@ -124,11 +124,13 @@
+ 		echo -n "Starting nagios:"
  		$NagiosBin -v $NagiosCfgFile > /dev/null 2>&1;
  		if [ $? -eq 0 ]; then
 -			su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile"
@@ -13,5 +13,5 @@
  			$NagiosBin -d $NagiosCfgFile
 +                        pidof nagios > $NagiosRunFile
  			if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi
- 			#sleep 1
- 			#status_nagios nagios
+ 			echo " done."
+ 			exit 0


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- nagios.spec	29 Sep 2008 02:21:49 -0000	1.59
+++ nagios.spec	20 Oct 2008 07:03:07 -0000	1.60
@@ -1,7 +1,7 @@
 Name: nagios
 
-Version: 3.0.3
-Release: 9%{?dist}
+Version: 3.0.4
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -12,8 +12,8 @@
 Source2: nagios.htaccess
 Source3: nagios.internet.cfg
 Source4: nagios.htpasswd
-Source5: nagios.UpgradeToVersion3.ReadMe
-Source6: nagios.UpgradeToVersion3.sh
+Source5: nagios.upgrade_to_v3.ReadMe
+Source6: nagios.upgrade_to_v3.sh
 Patch0: nagios-initrd.patch
 #Patch1: nagios.cfg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -202,6 +202,10 @@
 %{_includedir}/%{name}
 
 %changelog
+* Mon Oct 20 2008 Robert M. Albrecht <romal at gmx.de> 3.0.4-1
+- Upstream released 3.0.4
+- Fixed two typos in nagios.spec 
+
 * Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 3.0.3-9
 - License fix
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	10 Jul 2008 15:14:09 -0000	1.16
+++ sources	20 Oct 2008 07:03:07 -0000	1.17
@@ -1 +1 @@
-151df7bf19b696f7498410fb76fb7caf  nagios-3.0.3.tar.gz
+c14f8099488014b1f0e37699448d0a5c  nagios-3.0.4.tar.gz