rpms/collectd/F-9 collectd-4.5.1-configure-OpenIPMI.patch, NONE, 1.1 collectd-4.5.1-include-collectd.d.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 collectd.spec, 1.11, 1.12 sources, 1.5, 1.6 collectd-4.4.4-configure-OpenIPMI.patch, 1.1, NONE collectd-4.4.4-include-collectd.d.patch, 1.1, NONE

Sun Nov 30 13:50:44 UTC 2008

Author: apevec

Update of /cvs/pkgs/rpms/collectd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24038

Modified Files:
	.cvsignore collectd.spec sources 
Added Files:
	collectd-4.5.1-configure-OpenIPMI.patch 
	collectd-4.5.1-include-collectd.d.patch 
Removed Files:
	collectd-4.4.4-configure-OpenIPMI.patch 
	collectd-4.4.4-include-collectd.d.patch 
Log Message:
- upgrade to 4.5.1, bz# 470943
- enable Network UPS Tools (nut) plugin, bz# 465729
- enable postgresql plugin
- spec cleanup, bz# 473641


collectd-4.5.1-configure-OpenIPMI.patch:

--- NEW FILE collectd-4.5.1-configure-OpenIPMI.patch ---
--- configure.ORIG	2008-10-16 22:43:28.000000000 +0200
+++ configure	2008-11-30 11:30:53.000000000 +0100
@@ -36831,7 +36831,7 @@
 then
 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5
 echo $ECHO_N "checking for libOpenIPMIpthread... $ECHO_C" >&6; }
-	$PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null
+	$PKG_CONFIG --exists OpenIPMI 2>/dev/null
 	if test "$?" != "0"
 	then
 		with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)"
@@ -36844,7 +36844,7 @@
 then
 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5
 echo $ECHO_N "checking for libOpenIPMIpthread CFLAGS... $ECHO_C" >&6; }
-	temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`"
+	temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread"
 	if test "$?" = "0"
 	then
 		with_libopenipmipthread_cflags="$temp_result"
@@ -36860,7 +36860,7 @@
 then
 	{ echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5
 echo $ECHO_N "checking for libOpenIPMIpthread LDFLAGS... $ECHO_C" >&6; }
-	temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`"
+	temp_result="-lOpenIPMIpthread `$PKG_CONFIG --libs OpenIPMI`"
 	if test "$?" = "0"
 	then
 		with_libopenipmipthread_ldflags="$temp_result"

collectd-4.5.1-include-collectd.d.patch:

--- NEW FILE collectd-4.5.1-include-collectd.d.patch ---
--- collectd-4.5.1/src/collectd.conf.in.ORIG	2008-10-16 22:29:56.000000000 +0200
+++ collectd-4.5.1/src/collectd.conf.in	2008-11-30 10:39:23.000000000 +0100
@@ -26,7 +26,6 @@
 #	LogLevel info
 #</Plugin>
 
- at BUILD_PLUGIN_APACHE_TRUE@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
@@ -36,7 +35,6 @@
 @BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv
 @BUILD_PLUGIN_DF_TRUE at LoadPlugin df
 @BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
- at BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
 @BUILD_PLUGIN_EMAIL_TRUE at LoadPlugin email
 @BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
 @BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
@@ -44,34 +42,24 @@
 @BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
 @BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
 @BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
- at BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
 @BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs
 @BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq
- at BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
 @BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load
 @BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon
 @BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached
 @BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory
 @BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter
- at BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
 @BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink
 @BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network
 @BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
- at BUILD_PLUGIN_NGINX_TRUE@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
- at BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
 @BUILD_PLUGIN_ONEWIRE_TRUE at LoadPlugin onewire
- at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
 @BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
- at BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql
 @BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
 @BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
- at BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool
- at BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
 @BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
- at BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
 @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
 @BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
 @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
@@ -423,3 +411,4 @@
 #	Verbose false
 #</Plugin>
 
+Include "/etc/collectd.d"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2008 22:08:18 -0000	1.5
+++ .cvsignore	30 Nov 2008 13:50:13 -0000	1.6
@@ -1 +1 @@
-collectd-4.4.4.tar.bz2
+collectd-4.5.1.tar.bz2


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/collectd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- collectd.spec	22 Oct 2008 22:13:20 -0000	1.11
+++ collectd.spec	30 Nov 2008 13:50:13 -0000	1.12
@@ -1,6 +1,6 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.4.4
+Version: 4.5.1
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
@@ -28,6 +28,8 @@
 BuildRequires: libpcap-devel
 BuildRequires: mysql-devel
 BuildRequires: OpenIPMI-devel
+BuildRequires: postgresql-devel
+BuildRequires: nut-devel
 
 %description
 collectd is a small daemon written in C for performance.  It reads various
@@ -40,7 +42,7 @@
 %package apache
 Summary:       Apache plugin for collectd
 Group:         System Environment/Daemons
-Requires:      collectd = %{version}-%{release}, curl
+Requires:      collectd = %{version}-%{release}
 %description apache
 This plugin collects data provided by Apache's 'mod_status'.
 
@@ -64,7 +66,7 @@
 %package ipmi
 Summary:       IPMI module for collectd
 Group:         System Environment/Daemons
-Requires:      collectd = %{version}-%{release}, OpenIPMI
+Requires:      collectd = %{version}-%{release}
 %description ipmi
 This plugin for collectd provides IPMI support.
 
@@ -72,7 +74,7 @@
 %package mysql
 Summary:       MySQL module for collectd
 Group:         System Environment/Daemons
-Requires:      collectd = %{version}-%{release}, mysql
+Requires:      collectd = %{version}-%{release}
 %description mysql
 MySQL querying plugin. This plugins provides data of issued commands,
 called handlers and database traffic.
@@ -81,11 +83,19 @@
 %package nginx
 Summary:       Nginx plugin for collectd
 Group:         System Environment/Daemons
-Requires:      collectd = %{version}-%{release}, curl
+Requires:      collectd = %{version}-%{release}
 %description nginx
 This plugin gets data provided by nginx.
 
 
+%package nut
+Summary:       Network UPS Tools module for collectd
+Group:         System Environment/Daemons
+Requires:      collectd = %{version}-%{release}
+%description nut
+This plugin for collectd provides Network UPS Tools support.
+
+
 %package -n perl-Collectd
 Summary:       Perl bindings for collectd
 Group:         System Environment/Daemons
@@ -95,6 +105,15 @@
 This package contains Perl bindings and plugin for collectd.
 
 
+%package postgresql
+Summary:       PostgreSQL module for collectd
+Group:         System Environment/Daemons
+Requires:      collectd = %{version}-%{release}
+%description postgresql
+PostgreSQL querying plugin. This plugins provides data of issued commands,
+called handlers and database traffic.
+
+
 %package rrdtool
 Summary:       RRDTool module for collectd
 Group:         System Environment/Daemons
@@ -123,7 +142,7 @@
 %package virt
 Summary:       Libvirt plugin for collectd
 Group:         System Environment/Daemons
-Requires:      collectd = %{version}-%{release}, libvirt
+Requires:      collectd = %{version}-%{release}
 %description virt
 This plugin collects information from virtualized guests.
 
@@ -148,6 +167,8 @@
     --enable-perl \
     --enable-unixsock \
     --enable-ipmi \
+    --enable-nut \
+    --enable-postgresql \
     --with-perl-bindings=INSTALLDIRS=vendor
 %{__make} %{?_smp_mflags}
 
@@ -177,6 +198,9 @@
 mkdir perl-examples
 find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \;
 
+# postresql config example will be included by %doc
+rm %{buildroot}%{_datadir}/collectd/postgresql_default.conf
+
 # Move config contribs
 mkdir -p %{buildroot}/etc/collectd.d/
 cp contrib/redhat/apache.conf %{buildroot}/etc/collectd.d/apache.conf
@@ -187,7 +211,7 @@
 cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf
 
 # configs for subpackaged plugins
-for p in dns ipmi libvirt perl rrdtool
+for p in dns ipmi libvirt nut perl postgresql rrdtool
 do
 %{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF
 LoadPlugin $p
@@ -241,6 +265,7 @@
 %{_sbindir}/collectdmon
 %dir %{_localstatedir}/lib/collectd/
 
+%dir %{_libdir}/collectd
 %{_libdir}/collectd/*.so*
 %{_libdir}/collectd/types.db
 %exclude %{_libdir}/collectd/apache.so*
@@ -248,9 +273,11 @@
 %exclude %{_libdir}/collectd/email.so*
 %exclude %{_libdir}/collectd/ipmi.so*
 %exclude %{_libdir}/collectd/libvirt.so*
+%exclude %{_libdir}/collectd/nut.so*
 %exclude %{_libdir}/collectd/mysql.so*
 %exclude %{_libdir}/collectd/nginx.so*
 %exclude %{_libdir}/collectd/perl.so*
+%exclude %{_libdir}/collectd/postgresql.so*
 %exclude %{_libdir}/collectd/rrdtool.so*
 %exclude %{_libdir}/collectd/sensors.so*
 %exclude %{_libdir}/collectd/snmp.so*
@@ -302,6 +329,12 @@
 %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf
 
 
+%files nut
+%defattr(-, root, root, -)
+%{_libdir}/collectd/nut.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/nut.conf
+
+
 %files -n perl-Collectd
 %defattr(-, root, root, -)
 %doc perl-examples/*
@@ -313,6 +346,13 @@
 %doc %{_mandir}/man3/Collectd::Unixsock.3pm*
 
 
+%files postgresql
+%defattr(-, root, root, -)
+%{_libdir}/collectd/postgresql.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf
+%doc src/postgresql_default.conf
+
+
 %files rrdtool
 %defattr(-, root, root, -)
 %{_libdir}/collectd/rrdtool.so*
@@ -339,6 +379,12 @@
 
 
 %changelog
+* Sun Nov 30 2008 Alan Pevec <apevec at redhat.com> 4.5.1-1
+- upgrade to 4.5.1, bz# 470943
+- enable Network UPS Tools (nut) plugin, bz# 465729
+- enable postgresql plugin
+- spec cleanup, bz# 473641
+
 * Wed Oct 22 2008 Alan Pevec <apevec at redhat.com> 4.4.4-1
 - new upstream bugfix release 4.4.4
   http://collectd.org/news.shtml#news59


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2008 22:08:18 -0000	1.5
+++ sources	30 Nov 2008 13:50:13 -0000	1.6
@@ -1 +1 @@
-9e0e89150b1ff28fc0fdd8a198c9ac5e  collectd-4.4.4.tar.bz2
+d85e00de03d40ca66d5eb4775e58fc1f  collectd-4.5.1.tar.bz2


--- collectd-4.4.4-configure-OpenIPMI.patch DELETED ---


--- collectd-4.4.4-include-collectd.d.patch DELETED ---


