rpms/nagios-plugins/devel import.log, 1.1, 1.2 nagios-plugins.spec, 1.62, 1.63

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/nagios-plugins/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6232/devel

Modified Files:
	import.log nagios-plugins.spec 
Log Message:
Ver. 1.4.14 with rhbz tickets #469530, #526561, #538916 and #533777 closed


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Mar 2010 09:56:55 -0000	1.1
+++ import.log	12 Apr 2010 12:10:03 -0000	1.2
@@ -1 +1,2 @@
 nagios-plugins-1_4_14-1_fc12:HEAD:nagios-plugins-1.4.14-1.fc12.src.rpm:1268214975
+nagios-plugins-1_4_14-2_fc12:HEAD:nagios-plugins-1.4.14-2.fc12.src.rpm:1271074153


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- nagios-plugins.spec	10 Mar 2010 09:56:55 -0000	1.62
+++ nagios-plugins.spec	12 Apr 2010 12:10:04 -0000	1.63
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -28,8 +28,16 @@ BuildRequires: ntp
 BuildRequires: %{_bindir}/mailq
 BuildRequires: %{_sbindir}/fping
 BuildRequires: perl(Net::SNMP)
+%if 0%{?el4}
+%else
 BuildRequires: radiusclient-ng-devel
-BuildRequires: %{_bindir}/qstat
+%endif
+#BuildRequires: %{_bindir}/qstat
+#BuildRequires: %{_bindir}/quakestat
+BuildRequires: qstat
+
+Requires: nagios
+Requires(pre): nagios
 
 %global reqfilt sh -c "%{__perl_requires} | sed -e 's!perl(utils)!nagios-plugins-perl!'"
 %define __perl_requires %{reqfilt}
@@ -386,6 +394,8 @@ Requires: qstat
 %description game
 Provides check_game support for Nagios.
 
+%if 0%{?el4}
+%else
 %package radius
 Summary: Nagios Plugin - check_radius
 Group: Applications/System
@@ -393,6 +403,7 @@ Requires: nagios-plugins = %{version}-%{
 
 %description radius
 Provides check_radius support for Nagios.
+%endif
 
 %package real
 Summary: Nagios Plugin - check_real
@@ -519,7 +530,7 @@ Provides check_wave support for Nagios.
 %configure \
 	--libexecdir=%{_libdir}/nagios/plugins \
 	--with-mysql \
-	PATH_TO_QSTAT=%{_bindir}/qstat \
+	PATH_TO_QSTAT=%{_bindir}/quakestat \
 	PATH_TO_FPING=%{_sbindir}/fping \
 	PATH_TO_NTPQ=%{_sbindir}/ntpq \
 	PATH_TO_NTPDC=%{_sbindir}/ntpdc \
@@ -535,7 +546,10 @@ make %{?_smp_mflags}
 cd plugins
 make check_ide_smart
 make check_ldap
+%if 0%{?el4}
+%else
 make check_radius
+%endif
 make check_pgsql
 
 cd ..
@@ -553,7 +567,10 @@ sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS
 %{__install} -m 0755 contrib/check_linux_raid %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins/check_ldap %{buildroot}/%{_libdir}/nagios/plugins
+%if 0%{?el4}
+%else
 %{__install} -m 0755 plugins/check_radius %{buildroot}/%{_libdir}/nagios/plugins
+%endif
 %{__install} -m 0755 plugins/check_pgsql %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
@@ -729,9 +746,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_game
 
+%if 0%{?el4}
+%else
 %files radius
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_radius
+%endif
 
 %files real
 %defattr(-,root,root,-)
@@ -807,6 +827,11 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Mon Apr 12 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.4.14-2
+- Added missing Requires - nagios (see rhbz #469530).
+- Fixed path to qstat -> quakestat (see rhbz #533777)
+- Disable radius plugin for EL4 - there is not radiuscleint-ng for EL-4
+
 * Wed Mar 10 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.4.14-1
 - Ver. 1.4.14
 - Rebased patches.