rpms/nagios-plugins/F-13 import.log, 1.1, 1.2 nagios-plugins.spec, 1.62, 1.63
Peter Lemenkov
peter at fedoraproject.org
Sun Apr 25 08:59:50 UTC 2010
Author: peter
Update of /cvs/pkgs/rpms/nagios-plugins/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13947/F-13
Modified Files:
import.log nagios-plugins.spec
Log Message:
Fix dependency on nagios
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-13/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 12 Apr 2010 12:12:17 -0000 1.1
+++ import.log 25 Apr 2010 08:59:49 -0000 1.2
@@ -1 +1,2 @@
nagios-plugins-1_4_14-2_fc12:F-13:nagios-plugins-1.4.14-2.fc12.src.rpm:1271074308
+nagios-plugins-1_4_14-3_fc12:F-13:nagios-plugins-1.4.14-3.fc12.src.rpm:1272185956
Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios-plugins/F-13/nagios-plugins.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- nagios-plugins.spec 12 Apr 2010 12:12:18 -0000 1.62
+++ nagios-plugins.spec 25 Apr 2010 08:59:49 -0000 1.63
@@ -1,6 +1,6 @@
Name: nagios-plugins
Version: 1.4.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Host/service/network monitoring program plugins for Nagios
Group: Applications/System
@@ -32,18 +32,13 @@ BuildRequires: perl(Net::SNMP)
%else
BuildRequires: radiusclient-ng-devel
%endif
-#BuildRequires: %{_bindir}/qstat
-#BuildRequires: %{_bindir}/quakestat
BuildRequires: qstat
-
-Requires: nagios
-Requires(pre): nagios
+Requires: nagios-common
%global reqfilt sh -c "%{__perl_requires} | sed -e 's!perl(utils)!nagios-plugins-perl!'"
%define __perl_requires %{reqfilt}
-
%description
Nagios is a program that will monitor hosts and services on your
@@ -81,14 +76,6 @@ Requires: nagios-plugins = %{version}-%{
%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
@@ -98,10 +85,20 @@ Requires: %{_bindir}/ssh
%description by_ssh
Provides check_by_ssh 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 dhcp
Summary: Nagios Plugin - check_dhcp
Group: Applications/System
Requires: nagios-plugins = %{version}-%{release}
+Requires: group(nagios)
+Requires(pre): group(nagios)
%description dhcp
Provides check_dhcp support for Nagios.
@@ -172,10 +169,21 @@ Summary: Nagios Plugin - check_fping
Group: Applications/System
Requires: nagios-plugins = %{version}-%{release}
Requires: %{_sbindir}/fping
+Requires: group(nagios)
+Requires(pre): group(nagios)
%description fping
Provides check_fping 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 hpjd
Summary: Nagios Plugin - check_hpjd
Group: Applications/System
@@ -196,6 +204,8 @@ Provides check_http support for Nagios.
Summary: Nagios Plugin - check_icmp
Group: Applications/System
Requires: nagios-plugins = %{version}-%{release}
+Requires: group(nagios)
+Requires(pre): group(nagios)
%description icmp
Provides check_icmp support for Nagios.
@@ -204,6 +214,8 @@ Provides check_icmp support for Nagios.
Summary: Nagios Plugin - check_ide_smart
Group: Applications/System
Requires: nagios-plugins = %{version}-%{release}
+Requires: group(nagios)
+Requires(pre): group(nagios)
%description ide_smart
Provides check_ide_smart support for Nagios.
@@ -385,15 +397,6 @@ Requires: nagios-plugins = %{version}-%{
%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.
-
%if 0%{?el4}
%else
%package radius
@@ -584,6 +587,14 @@ sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS
%clean
rm -rf %{buildroot}
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc ACKNOWLEDGEMENTS AUTHORS BUGS ChangeLog CODING COPYING FAQ LEGAL NEWS README REQUIREMENTS SUPPORT THANKS README.Fedora
+%dir %{_libdir}/nagios/plugins
+%{_libdir}/nagios/plugins/negate
+%{_libdir}/nagios/plugins/urlize
+%{_libdir}/nagios/plugins/utils.sh
+
%files all
%files apt
@@ -594,14 +605,14 @@ rm -rf %{buildroot}
%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
+%files cluster
+%defattr(-,root,root,-)
+%{_libdir}/nagios/plugins/check_cluster
+
%files dhcp
%defattr(4750,root,nagios,-)
%{_libdir}/nagios/plugins/check_dhcp
@@ -635,8 +646,12 @@ rm -rf %{buildroot}
%{_libdir}/nagios/plugins/check_flexlm
%files fping
+%defattr(4750,root,nagios,-)
+%{_libdir}/nagios/plugins/check_fping
+
+%files game
%defattr(-,root,root,-)
-%attr(4750,root,nagios)%{_libdir}/nagios/plugins/check_fping
+%{_libdir}/nagios/plugins/check_game
%files hpjd
%defattr(-,root,root,-)
@@ -646,13 +661,9 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_libdir}/nagios/plugins/check_http
-%files ide_smart
-%defattr(-,root,root,-)
-%attr(4750,root,nagios)%{_libdir}/nagios/plugins/check_ide_smart
-
%files icmp
-%defattr(-,root,root,-)
-%attr(4750,root,nagios)%{_libdir}/nagios/plugins/check_icmp
+%defattr(4750,root,nagios,-)
+%{_libdir}/nagios/plugins/check_icmp
%files ifoperstatus
%defattr(-,root,root,-)
@@ -662,6 +673,8 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_libdir}/nagios/plugins/check_ifstatus
+%files ide_smart
+%defattr(4750,root,nagios,-)
%files ircd
%defattr(-,root,root,-)
%{_libdir}/nagios/plugins/check_ircd
@@ -742,10 +755,6 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_libdir}/nagios/plugins/check_procs
-%files game
-%defattr(-,root,root,-)
-%{_libdir}/nagios/plugins/check_game
-
%if 0%{?el4}
%else
%files radius
@@ -817,16 +826,14 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_libdir}/nagios/plugins/check_wave
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc ChangeLog CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS README.Fedora
-%dir %{_libdir}/nagios
-%dir %{_libdir}/nagios/plugins
-%{_libdir}/nagios/plugins/negate
-%{_libdir}/nagios/plugins/urlize
-%{_libdir}/nagios/plugins/utils.sh
-
%changelog
+* Sat Apr 24 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.4.14-3
+- Removed Requires - nagios (see rhbz #469530).
+- Added "Requires,Requires(pre): group(nagios)" where necessary
+- Sorted %%files sections
+- No need to ship INSTALL file
+- Added more doc files to main package
+
* 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)
More information about the scm-commits
mailing list