rpms/nagios-plugins/devel .cvsignore, 1.8, 1.9 nagios-plugins.spec, 1.31, 1.32 sources, 1.8, 1.9

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22785

Modified Files:
	.cvsignore nagios-plugins.spec sources 
Log Message:
upstream released new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Apr 2007 18:15:28 -0000	1.8
+++ .cvsignore	6 Dec 2007 15:34:07 -0000	1.9
@@ -1 +1 @@
-nagios-plugins-1.4.8.tar.gz
+nagios-plugins-1.4.10.tar.gz


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/nagios-plugins.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nagios-plugins.spec	26 Oct 2007 14:24:42 -0000	1.31
+++ nagios-plugins.spec	6 Dec 2007 15:34:07 -0000	1.32
@@ -1,6 +1,6 @@
 Name: nagios-plugins
-Version: 1.4.8
-Release: 9%{?dist}
+Version: 1.4.10
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -9,11 +9,8 @@
 Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
 Source1: nagios-plugins.README.Fedora
 Patch0: nagios-plugins-1.4.3-subst.patch
-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: check_smtp.recvline.diff.2
-Patch5: nagiosplugins-checksnmp-crash.patch
+Patch1: nagios-plugins-1.4.3-ntpd.patch
+Patch2: nagiosplugins-checksnmp-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -50,7 +47,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-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
+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, nagios!
 -plugins-cluster
 %ifnarch ppc ppc64 sparc sparc64
 Requires: nagios-plugins-sensors
 %endif
@@ -74,6 +71,14 @@
 %description breeze
 Provides check_breeze support for Nagios.
 
+%package cluster
+Summary: Nagios Plugin - check_cluster
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description cluster
+Provides check_cluster support for Nagios.
+
 %package by_ssh
 Summary: Nagios Plugin - check_by_ssh
 Group: Applications/System
@@ -506,9 +511,6 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
 
 %build
 %configure \
@@ -566,6 +568,10 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_breeze
 
+%files cluster
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_cluster
+
 %files by_ssh
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_by_ssh
@@ -637,6 +643,7 @@
 %files ldap
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_ldap
+%{_libdir}/nagios/plugins/check_ldaps
 
 %files linux_raid
 %defattr(-,root,root,-)
@@ -789,6 +796,10 @@
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Thu Dec 06 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.10-1
+- Upstream released new version
+- Removed some patches
+
 * Fri Oct 26 2007 Mike McGrath <mmcgrath at redhat.com> 1.4.8-9
 - Fix for Bug 348731 and CVE-2007-5623
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Apr 2007 18:15:28 -0000	1.8
+++ sources	6 Dec 2007 15:34:07 -0000	1.9
@@ -1 +1 @@
-ab16f99f8bd8a9b2897d003d3ba7024e  nagios-plugins-1.4.8.tar.gz
+c67841223864ae1626ab2adb2f0b4c9d  nagios-plugins-1.4.10.tar.gz