rpms/nagios-plugins/EL-4 nagios-plugins.spec,1.24,1.25

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24452/EL-4

Modified Files:
	nagios-plugins.spec 
Log Message:
fixes for bugs 234416 and 251635


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/EL-4/nagios-plugins.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nagios-plugins.spec	13 Mar 2007 22:34:28 -0000	1.24
+++ nagios-plugins.spec	10 Aug 2007 20:46:54 -0000	1.25
@@ -1,5 +1,5 @@
 Name: nagios-plugins
-Version: 1.4.6
+Version: 1.4.8
 Release: 3%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
@@ -12,7 +12,7 @@
 Patch1: nagios-plugins-1.4.6-radius-ng.patch
 Patch2: nagios-plugins-1.4.3-ntpd.patch
 Patch3: nagios-plugins-1.4.4-check_ide_smart.patch
-Patch4: nagios-plugins-1.4.4-linux_raid.patch
+Patch4: check_smtp.recvline.diff.2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -26,10 +26,10 @@
 BuildRequires: bind-utils
 BuildRequires: ntp
 BuildRequires: %{_bindir}/mailq
-#BuildRequires: %{_sbindir}/fping
-#BuildRequires: perl(Net::SNMP)
-#BuildRequires: radiusclient-ng-devel
-#BuildRequires: %{_bindir}/qstat
+BuildRequires: %{_sbindir}/fping
+BuildRequires: perl(Net::SNMP)
+BuildRequires: radiusclient-ng-devel
+BuildRequires: %{_bindir}/qstat
 
 %global reqfilt sh -c "%{__perl_requires} | sed -e 's!perl(utils)!nagios-plugins-perl!'"
 %define __perl_requires %{reqfilt}
@@ -49,7 +49,7 @@
 %package all
 Summary: Nagios Plugins - All plugins
 Group: Applications/System
-Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave, nagios-plugins-game, nagios-plugins-fping
+Requires: nagios-plugins-breeze, nagios-plugins-by_ssh, nagios-plugins-dhcp, nagios-plugins-dig, nagios-plugins-disk, nagios-plugins-disk_smb, nagios-plugins-dns, nagios-plugins-dummy, nagios-plugins-file_age, nagios-plugins-flexlm, nagios-plugins-fping, nagios-plugins-hpjd, nagios-plugins-http, nagios-plugins-icmp, nagios-plugins-ide_smart, nagios-plugins-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, nagios-plugins-mysql, nagios-plugins-nagios, nagios-plugins-nt, nagios-plugins-ntp, nagios-plugins-nwstat, nagios-plugins-oracle, nagios-plugins-overcr, nagios-plugins-pgsql, nagios-plugins-ping, nagios-plugins-procs, nagios-plugins-game, nagios-plugins-real, nagios-plugins-rpc, nagios-plugins-smtp, nagios-plugins-snmp, nagios-plugins-ssh, nagios-plugins-swap, nagios-plugins-tcp, nagios-plugins-time, nagios-plugins-udp, nagios-plugins-ups, nagios-plugins-users, nagios-plugins-wave
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -222,7 +222,7 @@
 Requires: nagios-plugins = %{version}-%{release}
 
 %description ldap
-Provides check_ldap and check_ldaps support for Nagios.
+Provides check_ldap support for Nagios.
 
 %package linux_raid
 Summary: Nagios Plugin - check_linux_raid
@@ -378,13 +378,13 @@
 %description game
 Provides check_game support for Nagios.
 
-#%package radius
-#Summary: Nagios Plugin - check_radius
-#Group: Applications/System
-#Requires: nagios-plugins = %{version}-%{release}
+%package radius
+Summary: Nagios Plugin - check_radius
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
 
-#%description radius
-#Provides check_radius support for Nagios.
+%description radius
+Provides check_radius support for Nagios.
 
 %package real
 Summary: Nagios Plugin - check_real
@@ -521,7 +521,14 @@
 make %{?_smp_mflags}
 cd plugins
 make check_ide_smart
+make check_ldap
+make check_radius
+make check_pgsql
+
 cd ..
+
+gawk -f plugins-scripts/subst contrib/check_linux_raid.pl > contrib/check_linux_raid
+
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -530,8 +537,11 @@
 %{__make} AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=%{buildroot} install
 %{__install} -m 0755 plugins-root/check_icmp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
-%{__install} -m 0755 contrib/check_linux_raid.pl %{buildroot}/%{_libdir}/nagios/plugins
+%{__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
+%{__install} -m 0755 plugins/check_radius %{buildroot}/%{_libdir}/nagios/plugins
+%{__install} -m 0755 plugins/check_pgsql %{buildroot}/%{_libdir}/nagios/plugins
 
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
@@ -604,7 +614,7 @@
 
 %files ide_smart
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_ide_smart
+%attr(4755,root,root)%{_libdir}/nagios/plugins/check_ide_smart
 
 %files icmp
 %defattr(-,root,root,-)
@@ -625,11 +635,10 @@
 %files ldap
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_ldap
-%{_libdir}/nagios/plugins/check_ldaps
 
 %files linux_raid
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_linux_raid.pl
+%{_libdir}/nagios/plugins/check_linux_raid
 
 %files load
 %defattr(-,root,root,-)
@@ -700,9 +709,9 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_game
 
-#%files radius
-#%defattr(-,root,root,-)
-#%{_libdir}/nagios/plugins/check_radius
+%files radius
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_radius
 
 %files real
 %defattr(-,root,root,-)
@@ -778,8 +787,15 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Tue Mar 13 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.6-3
-- Built for epel
+* Fri Aug 10 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.8-3
+- Fix for check_linux_raid - #234416
+- Fix for check_ide_disk - #251635
+
+* Tue Aug 07 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.8-2
+- Fix for check_smtp - #251049
+
+* Fri Apr 13 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.8-1
+- Upstream released new version
 
 * Fri Feb 23 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.6-1
 - Upstream released new version