SPECS (DEVEL): nagios-plugins.spec - 200510310547 snapshot - insta...

[glen]

Author: glen                         Date: Sat Nov  5 01:56:29 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 200510310547 snapshot
- install also root plugins

---- Files affected:
SPECS:
   nagios-plugins.spec (1.42.2.1 -> 1.42.2.2) 

---- Diffs:

================================================================
Index: SPECS/nagios-plugins.spec
diff -u SPECS/nagios-plugins.spec:1.42.2.1 SPECS/nagios-plugins.spec:1.42.2.2
--- SPECS/nagios-plugins.spec:1.42.2.1	Sat Nov  5 02:17:32 2005
+++ SPECS/nagios-plugins.spec	Sat Nov  5 02:56:23 2005
@@ -5,19 +5,21 @@
 Summary:	Host/service/network monitoring program plugins for Nagios
 Summary(pl):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
-Version:	1.4.2
-Release:	2.1
+Version:	1.4.3
+%define	_snap	200510310547
+%define	_rel	0.2
+Release:	0.%{_snap}.%{_rel}
 License:	GPL v2
 Group:		Networking
-%define	_snap	200510290447
 Source0:	http://nagiosplug.sourceforge.net/snapshot/%{name}-HEAD-%{_snap}.tar.gz
-# Source0-md5:	26cfb85944ce3356751a4c6c4b83a979
+# Source0-md5:	02dab6b958e3c4dbba7e79fb7582cf71
 #Source0:	http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-tainted.patch
 Patch2:		%{name}-contrib-API.patch
 Patch3:		%{name}-gettext.patch
 Patch4:		%{name}-subst.patch
+Patch5:		%{name}-noroot.patch
 URL:		http://nagiosplug.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -367,6 +369,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # bring contribs into shape...
 cd contrib
@@ -448,6 +451,9 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__make} install-root -C plugins-root \
+	DESTDIR=$RPM_BUILD_ROOT
+
 %find_lang %{name}
 
 cd contrib
@@ -481,13 +487,11 @@
 %{_plugindir}/utils.sh
 
 # plugins
-%{_plugindir}/check_dhcp
 %{_plugindir}/check_disk
 %{_plugindir}/check_dummy
 %{_plugindir}/check_file_age
 %{_plugindir}/check_ftp
 %{_plugindir}/check_http
-%{_plugindir}/check_icmp
 %{_plugindir}/check_imap
 %{_plugindir}/check_ircd
 %{_plugindir}/check_log
@@ -514,6 +518,10 @@
 %{_plugindir}/check_users
 %{_plugindir}/check_swap
 
+# these plugins need suid bit to operate
+%{_plugindir}/check_dhcp
+%{_plugindir}/check_icmp
+
 # requires license.dat
 %{_plugindir}/check_flexlm
 
@@ -664,6 +672,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42.2.2  2005/11/05 01:56:23  glen
+- 200510310547 snapshot
+- install also root plugins
+
 Revision 1.42.2.1  2005/11/05 01:17:32  glen
 - pass --with-proc-loadavg to avoid /proc mount requirement at build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios-plugins.spec?r1=1.42.2.1&r2=1.42.2.2&f=u