rpms/collectd/F-9 collectd-4.4.4-configure-OpenIPMI.patch, NONE, 1.1 collectd-4.4.4-include-collectd.d.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 collectd.spec, 1.9, 1.10 sources, 1.4, 1.5 collectd-4.4.3-include-collectd.d.patch, 1.2, NONE
Alan Pevec
apevec at fedoraproject.org
Wed Oct 22 22:08:49 UTC 2008
Author: apevec
Update of /cvs/pkgs/rpms/collectd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19999
Modified Files:
.cvsignore collectd.spec sources
Added Files:
collectd-4.4.4-configure-OpenIPMI.patch
collectd-4.4.4-include-collectd.d.patch
Removed Files:
collectd-4.4.3-include-collectd.d.patch
Log Message:
* 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
collectd-4.4.4-configure-OpenIPMI.patch:
--- NEW FILE collectd-4.4.4-configure-OpenIPMI.patch ---
--- configure.orig 2008-10-16 22:09:05.000000000 +0200
+++ configure 2008-10-22 21:55:41.000000000 +0200
@@ -36013,7 +36013,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)"
@@ -36026,7 +36026,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"
@@ -36042,7 +36042,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.4.4-include-collectd.d.patch:
--- NEW FILE collectd-4.4.4-include-collectd.d.patch ---
--- collectd-4.4.3/src/collectd.conf.in.orig 2008-09-04 09:59:01.000000000 +0200
+++ collectd-4.4.3/src/collectd.conf.in 2008-09-16 14:46:43.000000000 +0200
@@ -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,37 +35,27 @@
@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
- at BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
@BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
@BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
@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_NTPD_TRUE at LoadPlugin ntpd
@BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut
- at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
@BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
@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
@@ -348,3 +338,4 @@
# Verbose false
#</Plugin>
+Include "/etc/collectd.d"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 16 Sep 2008 13:14:20 -0000 1.4
+++ .cvsignore 22 Oct 2008 22:08:18 -0000 1.5
@@ -1 +1 @@
-collectd-4.4.3.tar.bz2
+collectd-4.4.4.tar.bz2
Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/collectd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- collectd.spec 2 Oct 2008 08:11:06 -0000 1.9
+++ collectd.spec 22 Oct 2008 22:08:18 -0000 1.10
@@ -1,13 +1,16 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 4.4.3
-Release: 2%{?dist}
+Version: 4.4.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}-%{version}-include-collectd.d.patch
+# bug 468067 "pkg-config --libs OpenIPMIpthread" fails
+Patch1: %{name}-%{version}-configure-OpenIPMI.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libvirt-devel, libxml2-devel
@@ -128,6 +131,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p0
sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
@@ -335,6 +339,10 @@
%changelog
+* 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
+
* Thu Oct 02 2008 Alan Pevec <apevec at redhat.com> 4.4.3-2
- exclude LoadPlugin email from default config
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Sep 2008 13:14:20 -0000 1.4
+++ sources 22 Oct 2008 22:08:18 -0000 1.5
@@ -1 +1 @@
-309b7a0b9b128a1575308773e1c43d9f collectd-4.4.3.tar.bz2
+9e0e89150b1ff28fc0fdd8a198c9ac5e collectd-4.4.4.tar.bz2
--- collectd-4.4.3-include-collectd.d.patch DELETED ---
More information about the fedora-extras-commits
mailing list