rpms/nagios-plugins/F-7 nagios-plugins.spec,1.25,1.26

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

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

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


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/F-7/nagios-plugins.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nagios-plugins.spec	7 Aug 2007 16:46:59 -0000	1.25
+++ nagios-plugins.spec	10 Aug 2007 20:46:59 -0000	1.26
@@ -12,8 +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
-Patch5: check_smtp.recvline.diff.2
+Patch4: check_smtp.recvline.diff.2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -508,7 +507,6 @@
 %patch2 -p0
 %patch3 -p1
 %patch4 -p0
-%patch5 -p0
 
 %build
 %configure \
@@ -528,6 +526,9 @@
 make check_pgsql
 
 cd ..
+
+gawk -f plugins-scripts/subst contrib/check_linux_raid.pl > contrib/check_linux_raid
+
 cp %{SOURCE1} ./README.Fedora
 
 %install
@@ -536,7 +537,7 @@
 %{__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
@@ -548,8 +549,6 @@
 
 %{__chmod} 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm
 
-%{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
-
 %find_lang %{name}
 
 %clean
@@ -615,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,-)
@@ -639,7 +638,7 @@
 
 %files linux_raid
 %defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_linux_raid.pl
+%{_libdir}/nagios/plugins/check_linux_raid
 
 %files load
 %defattr(-,root,root,-)
@@ -788,7 +787,11 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Tue Aug 07 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.8-3
+* 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