rpms/collectd/F-13 collectd-4.6.2-include-collectd.d.patch, 1.4, 1.5 collectd.spec, 1.31, 1.32

[Alan Pevec]

Author: apevec

Update of /cvs/pkgs/rpms/collectd/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21444

Modified Files:
	collectd-4.6.2-include-collectd.d.patch collectd.spec 
Log Message:
* Fri Mar 26 2010 Alan Pevec <apevec at redhat.com> 4.8.3-3
- enable ping plugin bz#541744



collectd-4.6.2-include-collectd.d.patch:
 collectd.conf.in |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

Index: collectd-4.6.2-include-collectd.d.patch
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-13/collectd-4.6.2-include-collectd.d.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- collectd-4.6.2-include-collectd.d.patch	16 Feb 2010 20:14:17 -0000	1.4
+++ collectd-4.6.2-include-collectd.d.patch	26 Mar 2010 18:05:29 -0000	1.5
@@ -30,7 +30,7 @@ diff -rup collectd-4.8.3-orig/src/collec
  @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load
  #@BUILD_PLUGIN_MADWIFI_TRUE at LoadPlugin madwifi
  #@BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon
-@@ -87,30 +82,22 @@ FQDNLookup   true
+@@ -87,30 +82,21 @@ FQDNLookup   true
  #@BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached
  @BUILD_PLUGIN_MEMORY_TRUE@@BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory
  #@BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter
@@ -48,7 +48,7 @@ diff -rup collectd-4.8.3-orig/src/collec
  #@BUILD_PLUGIN_OPENVPN_TRUE at LoadPlugin openvpn
  #@BUILD_PLUGIN_ORACLE_TRUE at LoadPlugin oracle
 -#@BUILD_PLUGIN_PERL_TRUE at LoadPlugin perl
- #@BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
+-#@BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
 -#@BUILD_PLUGIN_POSTGRESQL_TRUE at LoadPlugin postgresql
  #@BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
  #@BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-13/collectd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- collectd.spec	17 Mar 2010 19:56:38 -0000	1.31
+++ collectd.spec	26 Mar 2010 18:05:29 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -35,6 +35,7 @@ BuildRequires: OpenIPMI-devel
 BuildRequires: postgresql-devel
 BuildRequires: nut-devel
 BuildRequires: iptables-devel
+BuildRequires: liboping-devel
 
 %description
 collectd is a small daemon written in C for performance.  It reads various
@@ -110,6 +111,14 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%
 This package contains Perl bindings and plugin for collectd.
 
 
+%package ping
+Summary:       ping module for collectd
+Group:         System Environment/Daemons
+Requires:      collectd = %{version}-%{release}
+%description ping
+This plugin for collectd provides network latency statistics.
+
+
 %package postgresql
 Summary:       PostgreSQL module for collectd
 Group:         System Environment/Daemons
@@ -187,7 +196,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.i
     --enable-nut \
     --enable-postgresql \
     --enable-iptables \
-    --disable-ping \
+    --enable-ping \
     --with-libiptc \
     --with-perl-bindings=INSTALLDIRS=vendor
 %{__make} %{?_smp_mflags}
@@ -242,7 +251,7 @@ cp contrib/redhat/sensors.conf %{buildro
 cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf
 
 # configs for subpackaged plugins
-for p in dns ipmi libvirt nut perl postgresql rrdtool
+for p in dns ipmi libvirt nut perl ping postgresql rrdtool
 do
 %{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF
 LoadPlugin $p
@@ -287,6 +296,7 @@ fi
 %exclude %{_sysconfdir}/collectd.d/nginx.conf
 %exclude %{_sysconfdir}/collectd.d/nut.conf
 %exclude %{_sysconfdir}/collectd.d/perl.conf
+%exclude %{_sysconfdir}/collectd.d/ping.conf
 %exclude %{_sysconfdir}/collectd.d/postgresql.conf
 %exclude %{_sysconfdir}/collectd.d/rrdtool.conf
 %exclude %{_sysconfdir}/collectd.d/sensors.conf
@@ -433,6 +443,12 @@ fi
 %doc %{_mandir}/man3/Collectd::Unixsock.3pm*
 
 
+%files ping
+%defattr(-, root, root, -)
+%{_libdir}/collectd/ping.so
+%config(noreplace) %{_sysconfdir}/collectd.d/ping.conf
+
+
 %files postgresql
 %defattr(-, root, root, -)
 %{_libdir}/collectd/postgresql.so
@@ -473,6 +489,9 @@ fi
 
 
 %changelog
+* Fri Mar 26 2010 Alan Pevec <apevec at redhat.com> 4.8.3-3
+- enable ping plugin bz#541744
+
 * Wed Mar 17 2010 Mike McGrath <mmcgrath at redhat.com> 4.8.3-2
 - Added web interface