rpms/collectd/devel collectd-4.9.1-include-collectd.d.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 collectd.spec, 1.30, 1.31 sources, 1.12, 1.13 collectd-4.6.2-include-collectd.d.patch, 1.4, NONE

Mon Mar 8 22:55:56 UTC 2010

Author: apevec

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17450

Modified Files:
	.cvsignore collectd.spec sources 
Added Files:
	collectd-4.9.1-include-collectd.d.patch 
Removed Files:
	collectd-4.6.2-include-collectd.d.patch 
Log Message:
* Mon Mar 08 2010 Lubomir Rintel <lkundrak at v3.sl> 4.9.1-1
- New upstream version 4.9.1
  http://collectd.org/news.shtml#news81


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

--- NEW FILE collectd-4.9.1-include-collectd.d.patch ---

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 049b07d..a795169 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -50,7 +50,6 @@ FQDNLookup   true
 # to missing dependencies or because they have been deactivated explicitly.  #
 ##############################################################################
 
-#@BUILD_PLUGIN_APACHE_TRUE at LoadPlugin apache
 #@BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups
 #@BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors
 #@BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent
@@ -66,8 +65,6 @@ FQDNLookup   true
 #@BUILD_PLUGIN_DBI_TRUE at LoadPlugin dbi
 #@BUILD_PLUGIN_DF_TRUE at LoadPlugin df
 #@BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
-#@BUILD_PLUGIN_DNS_TRUE at LoadPlugin dns
-#@BUILD_PLUGIN_EMAIL_TRUE at LoadPlugin email
 #@BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
 #@BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
 #@BUILD_PLUGIN_FILECOUNT_TRUE at LoadPlugin filecount
@@ -76,11 +73,9 @@ FQDNLookup   true
 #@BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
 @BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
 #@BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
-#@BUILD_PLUGIN_IPMI_TRUE at LoadPlugin ipmi
 #@BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs
 #@BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq
 #@BUILD_PLUGIN_JAVA_TRUE at LoadPlugin java
-#@BUILD_PLUGIN_LIBVIRT_TRUE at LoadPlugin libvirt
 @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
@@ -88,33 +83,25 @@ 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
-#@BUILD_PLUGIN_MYSQL_TRUE at LoadPlugin mysql
 #@BUILD_PLUGIN_NETAPP_TRUE at LoadPlugin netapp
 #@BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink
 @LOAD_PLUGIN_NETWORK at LoadPlugin network
 #@BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
-#@BUILD_PLUGIN_NGINX_TRUE at LoadPlugin nginx
 #@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE at LoadPlugin notify_desktop
 #@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE at LoadPlugin notify_email
 #@BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd
-#@BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut
 #@BUILD_PLUGIN_OLSRD_TRUE at LoadPlugin olsrd
 #@BUILD_PLUGIN_ONEWIRE_TRUE at LoadPlugin onewire
 #@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_POSTGRESQL_TRUE at LoadPlugin postgresql
 #@BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
 #@BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
 #@BUILD_PLUGIN_PROTOCOLS_TRUE at LoadPlugin protocols
 #@BUILD_PLUGIN_PYTHON_TRUE at LoadPlugin python
 #@BUILD_PLUGIN_ROUTEROS_TRUE at LoadPlugin routeros
 #@BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached
- at LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
-#@BUILD_PLUGIN_SENSORS_TRUE at LoadPlugin sensors
 #@BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
-#@BUILD_PLUGIN_SNMP_TRUE at LoadPlugin snmp
 #@BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
 #@BUILD_PLUGIN_TABLE_TRUE at LoadPlugin table
 #@BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
@@ -674,6 +661,7 @@ FQDNLookup   true
 #	CreateFiles true
 #	CollectStatistics true
 #</Plugin>
+Include "/etc/collectd.d"
 
 #<Plugin rrdtool>
 #	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	16 Feb 2010 20:14:17 -0000	1.12
+++ .cvsignore	8 Mar 2010 22:55:55 -0000	1.13
@@ -1 +1 @@
-collectd-4.8.3.tar.bz2
+collectd-4.9.1.tar.bz2


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- collectd.spec	22 Feb 2010 20:58:52 -0000	1.30
+++ collectd.spec	8 Mar 2010 22:55:55 -0000	1.31
@@ -1,13 +1,13 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.8.3
+Version: 4.9.1
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
 
 Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
-Patch0: %{name}-4.6.2-include-collectd.d.patch
+Patch0: %{name}-4.9.1-include-collectd.d.patch
 # bug 468067 "pkg-config --libs OpenIPMIpthread" fails
 Patch1: %{name}-4.6.2-configure-OpenIPMI.patch
 # bug 564943 FTBFS system libiptc is not usable anymore, fix owniptc
@@ -277,8 +277,9 @@ fi
 %dir %{_libdir}/collectd
 %{_libdir}/collectd/apcups.so
 %{_libdir}/collectd/battery.so
-%{_libdir}/collectd/cpu.so
+%{_libdir}/collectd/contextswitch.so
 %{_libdir}/collectd/cpufreq.so
+%{_libdir}/collectd/cpu.so
 %{_libdir}/collectd/csv.so
 %{_libdir}/collectd/df.so
 %{_libdir}/collectd/disk.so
@@ -293,6 +294,7 @@ fi
 %{_libdir}/collectd/logfile.so
 %{_libdir}/collectd/madwifi.so
 %{_libdir}/collectd/match_empty_counter.so
+%{_libdir}/collectd/match_hashed.so
 %{_libdir}/collectd/mbmon.so
 %{_libdir}/collectd/memcached.so
 %{_libdir}/collectd/memory.so
@@ -307,6 +309,7 @@ fi
 %{_libdir}/collectd/swap.so
 %{_libdir}/collectd/syslog.so
 %{_libdir}/collectd/tail.so
+%{_libdir}/collectd/target_scale.so
 %{_libdir}/collectd/tcpconns.so
 %{_libdir}/collectd/teamspeak2.so
 %{_libdir}/collectd/thermal.so
@@ -352,9 +355,9 @@ fi
 %doc %{_mandir}/man5/collectd-exec.5*
 %doc %{_mandir}/man5/collectd-java.5*
 %doc %{_mandir}/man5/collectd-unixsock.5*
+%doc %{_mandir}/man5/collectd-python.5*
 %doc %{_mandir}/man5/types.db.5*
 
-
 %files apache
 %defattr(-, root, root, -)
 %{_libdir}/collectd/apache.so
@@ -442,6 +445,10 @@ fi
 
 
 %changelog
+* Mon Mar 08 2010 Lubomir Rintel <lkundrak at v3.sl> 4.9.1-1
+- New upstream version 4.9.1
+  http://collectd.org/news.shtml#news81
+
 * Tue Feb 16 2010 Alan Pevec <apevec at redhat.com> 4.8.3-1
 - New upstream version 4.8.3
   http://collectd.org/news.shtml#news81


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	16 Feb 2010 20:14:17 -0000	1.12
+++ sources	8 Mar 2010 22:55:55 -0000	1.13
@@ -1 +1 @@
-34e47c23515b52247d8af57e294396a8  collectd-4.8.3.tar.bz2
+5753496651c8c84afaea1fe290876bfc  collectd-4.9.1.tar.bz2


--- collectd-4.6.2-include-collectd.d.patch DELETED ---

