Author: glen Date: Sun May 21 21:38:55 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - merge 1.4.3 from DEVEL (1.42.2.10)
---- Files affected: SPECS: nagios-plugins.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: SPECS/nagios-plugins.spec diff -u SPECS/nagios-plugins.spec:1.48 SPECS/nagios-plugins.spec:1.49 --- SPECS/nagios-plugins.spec:1.48 Fri Apr 7 10:42:32 2006 +++ SPECS/nagios-plugins.spec Sun May 21 23:38:49 2006 @@ -2,23 +2,22 @@ # TODO: # - package requisites for unifished packages -nsclient and -nwstat # REQUIREMENTS explains the dependencies. +# - gnutls vs openssl %include /usr/lib/rpm/macros.perl 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: 4.8 +Version: 1.4.3 +Release: 0.2 License: GPL v2 Group: Networking -#define _snap 200510290447 -#Source0: http://nagiosplug.sourceforge.net/snapshot/%{name}-HEAD-%{_snap}.tar.gz Source0: http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz -# Source0-md5: 1f2bee15ade3d98ec79964a43479e328 -Patch0: %{name}-configure.patch -Patch1: %{name}-tainted.patch -Patch2: %{name}-contrib-API.patch -Patch3: %{name}-gettext.patch -Patch4: %{name}-subst.patch +# Source0-md5: 2c40fc69d51cc979e85150870a1daa93 +Patch0: %{name}-tainted.patch +Patch1: %{name}-contrib-API.patch +Patch2: %{name}-gettext.patch +Patch3: %{name}-subst.patch +Patch4: %{name}-noroot.patch Patch5: %{name}-check_ping-socket-filter-warning.patch URL: http://nagiosplug.sourceforge.net/ BuildRequires: autoconf @@ -35,9 +34,8 @@ BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.177 Requires: nagios-core -Obsoletes: nagios-plugins-cluster Obsoletes: netsaint-plugins -Conflicts: iputils-ping < 1:ss021109-3.1 +Conflicts: iputils-ping < 1:ss020124 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _plugindir %{_libdir}/nagios/plugins @@ -391,7 +389,7 @@ check_smb.sh sed -i -e " - s,use lib '/usr/local/nagios/libexec/',use lib '%{_plugindir}', + s,use lib '.*/nagios/libexec/',use lib '%{_plugindir}', s,require '/usr/libexec/nagios/plugins,require '%{_plugindir}, s,use lib utils.pm,use lib '%{_plugindir}', " *.pl @@ -402,8 +400,8 @@ chmod a+x check_*.{pl,sh,py} chmod a+x check_{fan_{cpq,fsc}_present,frontpage,oracle_tbs,pfstate,temp_{cpq,fsc}} -# same as in main -rm -f check_{breeze,wave}.pl +# exists in main +rm check_{breeze,wave}.pl %build %{__gettextize} @@ -424,6 +422,7 @@ --with-ps-cols=8 \ --with-ps-varlist="procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" \ --with-proc-meminfo=/proc/meminfo \ + --with-proc-loadavg=/proc/loadavg \ --with-nslookup-command="/usr/bin/nslookup -sil" \ --with-uptime-command=/usr/bin/uptime \ --with-rpcinfo-command=/usr/sbin/rpcinfo \ @@ -459,6 +458,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__make} install-root -C plugins-root \ + DESTDIR=$RPM_BUILD_ROOT + %find_lang %{name} cd contrib @@ -493,13 +495,11 @@ # plugins %{_plugindir}/check_cluster2 -%{_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 @@ -526,6 +526,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 @@ -554,6 +558,7 @@ %files mysql %defattr(755,root,root,755) %{_plugindir}/check_mysql +%{_plugindir}/check_mysql_query %files pgsql %defattr(755,root,root,755) @@ -674,6 +679,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.49 2006/05/21 21:38:49 glen +- merge 1.4.3 from DEVEL (1.42.2.10) + Revision 1.48 2006/04/07 08:42:32 glen - use perl autodeps, small fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/nagios-plugins.spec?r1=1.48&r2=1.49&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
