rpms/nagios/devel .cvsignore, 1.20, 1.21 import.log, 1.1, 1.2 nagios-0002-SELinux-relabeling.patch, 1.1, 1.2 nagios.spec, 1.77, 1.78 sources, 1.21, 1.22

[Peter Lemenkov]

Author: peter

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

Modified Files:
	.cvsignore import.log nagios-0002-SELinux-relabeling.patch 
	nagios.spec sources 
Log Message:
Nagios ver. 3.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	17 Aug 2009 13:48:25 -0000	1.20
+++ .cvsignore	13 Mar 2010 06:38:18 -0000	1.21
@@ -1 +1 @@
-nagios-3.2.0.tar.gz
+nagios-3.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	25 Feb 2010 11:55:47 -0000	1.1
+++ import.log	13 Mar 2010 06:38:18 -0000	1.2
@@ -1 +1,2 @@
 nagios-3_2_0-4_fc12:HEAD:nagios-3.2.0-4.fc12.src.rpm:1267098879
+nagios-3_2_1-1_fc12:HEAD:nagios-3.2.1-1.fc12.src.rpm:1268462221

nagios-0002-SELinux-relabeling.patch:
 daemon-init.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: nagios-0002-SELinux-relabeling.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios-0002-SELinux-relabeling.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nagios-0002-SELinux-relabeling.patch	25 Feb 2010 11:55:48 -0000	1.1
+++ nagios-0002-SELinux-relabeling.patch	13 Mar 2010 06:38:18 -0000	1.2
@@ -18,7 +18,7 @@ index f2feb9d..d544eb4 100644
  			rm -f $NagiosCommandFile
  			touch $NagiosRunFile
  			chown $NagiosUser:$NagiosGroup $NagiosRunFile
-+			[-x /sbin/restorecon ] && /sbin/restorecon $NagiosRunFile
++			[ -x /sbin/restorecon ] && /sbin/restorecon $NagiosRunFile
  			$NagiosBin -d $NagiosCfgFile
                          pidof nagios > $NagiosRunFile
  			if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- nagios.spec	25 Feb 2010 11:55:48 -0000	1.77
+++ nagios.spec	13 Mar 2010 06:38:19 -0000	1.78
@@ -1,6 +1,6 @@
 Name: nagios
-Version: 3.2.0
-Release: 4%{?dist}
+Version: 3.2.1
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -210,6 +210,10 @@ fi
 %{_includedir}/%{name}
 
 %changelog
+* Sat Mar 13 2010 Peter Lemenkov <lemenkov at gmail.com> - 3.2.1-1
+- Upgrade to 3.2.1 (#572587).
+- Fixed SELinux patch (#573119).
+
 * Thu Feb 25 2010 Peter Lemenkov <lemenkov at gmail.com> - 3.2.0-4
 - The package builds now with distro CFLAGS, CXXFLAGS (see bz #520979)
 - Fixed returning status for init-script (see bz #546561)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	17 Aug 2009 13:48:25 -0000	1.21
+++ sources	13 Mar 2010 06:38:19 -0000	1.22
@@ -1 +1 @@
-3566167cc60ddeaad34e7d2e26ed4a58  nagios-3.2.0.tar.gz
+d4655ee8c95c9679fd4fd53dac34bbe3  nagios-3.2.1.tar.gz