rpms/nagios-plugins/FC-3 nagios-plugins.spec,1.9,1.10

Sun Aug 27 18:07:41 UTC 2006

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31299/FC-3

Modified Files:
	nagios-plugins.spec 
Log Message:
Removed utils.pm from the base package and moved it to its own package



Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-3/nagios-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10

--- nagios-plugins.spec	26 Jun 2006 16:12:50 -0000	1.9
+++ nagios-plugins.spec	27 Aug 2006 18:07:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.3
-Release: 13%{?dist}
+Release: 18%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -8,6 +8,9 @@
 URL: http://nagiosplug.sourceforge.net/
 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.3.radius-ng.patch
+Patch2: nagios-plugins-1.4.3-ntpd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -21,10 +24,15 @@
 BuildRequires: bind-utils
 BuildRequires: ntp
 BuildRequires: %{_bindir}/mailq
-BuildRequires: perl(Net::SNMP)
-%if "%{?fedora}" > "3"
 BuildRequires: %{_sbindir}/fping
-%endif
+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}
+
+
 
 %description
 
@@ -39,13 +47,10 @@
 %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-ircd, nagios-plugins-ldap, nagios-plugins-load, nagios-plugins-log, nagios-plugins-mailq, nagios-plugins-mrtg, nagios-plugins-mrtgtraf, 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
+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-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
-%if "%{?fedora}" > "3"
-Requires: nagios-plugins-fping
-%endif
 
 %description all
 This package provides all Nagios plugins.
@@ -136,7 +141,6 @@
 %description flexlm
 Provides check_flexlm support for Nagios.
 
-%if "%{?fedora}" > "3"
 %package fping
 Summary: Nagios Plugin - check_fping
 Group: Applications/System
@@ -145,7 +149,6 @@
 
 %description fping
 Provides check_fping support for Nagios.
-%endif
 
 %package hpjd
 Summary: Nagios Plugin - check_hpjd
@@ -313,6 +316,15 @@
 %description overcr
 Provides check_overcr support for Nagios.
 
+%package perl
+Summary: Nagios plugins perl dep.
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description perl
+Perl dep for nagios plugins.  This is *NOT* an actual plugin it simply provides
+utils.pm
+
 %package pgsql
 Summary: Nagios Plugin - check_pgsql
 Group: Applications/System
@@ -339,6 +351,23 @@
 %description procs
 Provides check_procs support for Nagios.
 
+%package game
+Summary: Nagios Plugin - check_game
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+Requires: qstat
+
+%description game
+Provides check_game support for Nagios.
+
+%package radius
+Summary: Nagios Plugin - check_radius
+Group: Applications/System
+Requires: nagios-plugins = %{version}-%{release}
+
+%description radius
+Provides check_radius support for Nagios.
+
 %package real
 Summary: Nagios Plugin - check_real
 Group: Applications/System
@@ -455,11 +484,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1 -b .radiusclient
+%patch2 -p0
 
 %build
 %configure \
 	--libexecdir=%{_libdir}/nagios/plugins \
 	--with-mysql \
+	PATH_TO_QSTAT=%{_bindir}/qstat \
 	PATH_TO_FPING=%{_sbindir}/fping \
 	PATH_TO_NTPQ=%{_sbindir}/ntpq \
 	PATH_TO_NTPDC=%{_sbindir}/ntpdc \
@@ -478,9 +511,6 @@
 %{__install} -m 0755 plugins-root/check_dhcp %{buildroot}/%{_libdir}/nagios/plugins
 %{__install} -m 0755 plugins/check_ide_smart %{buildroot}/%{_libdir}/nagios/plugins
 
-# qstat is not provided by Fedora yet
-%{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_game
-
 %ifarch ppc ppc64 sparc sparc64
 %{__rm} -f %{buildroot}/%{_libdir}/nagios/plugins/check_sensors
 %endif
@@ -503,7 +533,7 @@
 %{_libdir}/nagios/plugins/check_by_ssh
 
 %files dhcp
-%defattr(-,root,root,-)
+%defattr(4750,root,nagios,-)
 %{_libdir}/nagios/plugins/check_dhcp
 
 %files dig
@@ -534,11 +564,9 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_flexlm
 
-%if "%{?fedora}" > "3"
 %files fping
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_fping
-%endif
 
 %files hpjd
 %defattr(-,root,root,-)
@@ -622,6 +650,10 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_overcr
 
+%files perl
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/utils.pm
+
 %files pgsql
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_pgsql
@@ -634,6 +666,14 @@
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_procs
 
+%files game
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_game
+
+%files radius
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_radius
+
 %files real
 %defattr(-,root,root,-)
 %{_libdir}/nagios/plugins/check_real
@@ -706,11 +746,29 @@
 %dir %{_libdir}/nagios/plugins
 %{_libdir}/nagios/plugins/negate
 %{_libdir}/nagios/plugins/urlize
-%{_libdir}/nagios/plugins/utils.*
+%{_libdir}/nagios/plugins/utils.sh
 
 %changelog
-* Mon Jun 26 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-13
-- Excluds support for fping in FC3
+* Sun Aug 27 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-18
+- Removed utils.pm from the base nagios-plugins package into its own package
+
+* Tue Aug 15 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-17
+- Added requires qstat for check_game
+
+* Thu Aug 03 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-16
+- Providing path to qstat
+
+* Thu Aug 03 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-15
+- Fixed permissions on check_dhcp
+- Added check_game
+- Added check_radius
+- Added patch for ntp
+
+* Sun Jul 23 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-14
+- Patched upstream issue: 196356
+
+* Sun Jul 23 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-13
+- nagios-plugins-all now includes nagios-plugins-mysql
 
 * Thu Jun 22 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-12
 - removed sensors support for sparc and sparc64


