packages: nagios-n2rrd/nagios-n2rrd.spec - uses RRD::Simple module - fix co...
glen
glen at pld-linux.org
Sat Dec 4 22:20:44 CET 2010
Author: glen Date: Sat Dec 4 21:20:44 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- uses RRD::Simple module
- fix config name
---- Files affected:
packages/nagios-n2rrd:
nagios-n2rrd.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/nagios-n2rrd/nagios-n2rrd.spec
diff -u packages/nagios-n2rrd/nagios-n2rrd.spec:1.2 packages/nagios-n2rrd/nagios-n2rrd.spec:1.3
--- packages/nagios-n2rrd/nagios-n2rrd.spec:1.2 Sat Dec 4 21:46:18 2010
+++ packages/nagios-n2rrd/nagios-n2rrd.spec Sat Dec 4 22:20:39 2010
@@ -3,7 +3,7 @@
Summary: N2RRD/RRD2GRAPH Performance data collector and Graph generator
Name: nagios-n2rrd
Version: 1.4.1
-Release: 0.4
+Release: 0.7
License: GPL v2
Group: Applications
Source0: http://n2rrd.diglinks.com/download/n2rrd-%{version}.tar.gz
@@ -12,7 +12,9 @@
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: sed >= 4.0
Requires: nagios-common
+Requires: perl-RRD-Simple
Requires: perl-rrdtool
+Requires: rrdtool
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -73,12 +75,12 @@
cat > n2rrd.cfg <<'EOF'
define command {
command_name n2rrd-process-host-perfdata
- command_line %{nagioslibdir}/n2rrd.pl -c %{_sysconfdir}/n2rrd.conf -D "HOST" -N "%{nagios_status_file}" -C '$HOSTCHECKCOMMAND$' -T $LASTHOSTCHECK$ -H $HOSTNAME$ -s "check_fping" -o "$HOSTPERFDATA$"
+ command_line %{nagioslibdir}/n2rrd -c %{_sysconfdir}/n2rrd.conf -D "HOST" -N "%{nagios_status_file}" -C '$HOSTCHECKCOMMAND$' -T $LASTHOSTCHECK$ -H $HOSTNAME$ -s "check_fping" -o "$HOSTPERFDATA$"
}
define command {
command_name n2rrd-process-service-perfdata
- command_line %{nagioslibdir}/n2rrd.pl -c %{_sysconfdir}/n2rrd.conf -N "%{nagios_status_file}" -C '$SERVICECHECKCOMMAND$' -e $SERVICEEXECUTIONTIME$ -l $SERVICELATENCY$ -T $LASTSERVICECHECK$ -H $HOSTNAME$ -s "$SERVICEDESC$" -o "$SERVICEPERFDATA$"
+ command_line %{nagioslibdir}/n2rrd -c %{_sysconfdir}/n2rrd.conf -N "%{nagios_status_file}" -C '$SERVICECHECKCOMMAND$' -e $SERVICEEXECUTIONTIME$ -l $SERVICELATENCY$ -T $LASTSERVICECHECK$ -H $HOSTNAME$ -s "$SERVICEDESC$" -o "$SERVICEPERFDATA$"
}
EOF
@@ -88,7 +90,7 @@
install -d $RPM_BUILD_ROOT{%{nagioslibdir},%{nagiosconfdir}/plugins,%{nagioscgidir},%{nagiosdatadir}/js}
install n2rrd.pl $RPM_BUILD_ROOT%{nagioslibdir}/n2rrd
cp -a n2rrd.conf $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a n2rrd.cfg $RPM_BUILD_ROOT%{nagiosconfdir}/plugins/n2rrd.conf
+cp -a n2rrd.cfg $RPM_BUILD_ROOT%{nagiosconfdir}/plugins
# rrd2graph
install -d $RPM_BUILD_ROOT{/var/cache/n2rrd,%{_examplesdir}/%{name}-%{version}}
@@ -115,7 +117,7 @@
%dir %{_sysconfdir}/templates/rewrite
%dir %{_sysconfdir}/templates/rra
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/n2rrd.conf
-%config(noreplace) %verify(not md5 mtime size) %{nagiosconfdir}/plugins/n2rrd.conf
+%config(noreplace) %verify(not md5 mtime size) %{nagiosconfdir}/plugins/n2rrd.cfg
%attr(755,root,root) %{nagioslibdir}/n2rrd
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/templates/environment.t
@@ -136,6 +138,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2010/12/04 21:20:39 glen
+- uses RRD::Simple module
+- fix config name
+
Revision 1.2 2010/12/04 20:46:18 glen
- up to 1.4.1, not tested even now
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-n2rrd/nagios-n2rrd.spec?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list