rpms/collectd/devel collectd-4.6.2-configure-OpenIPMI.patch, NONE, 1.1 collectd-4.6.2-include-collectd.d.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 collectd.spec, 1.18, 1.19 sources, 1.7, 1.8 collectd-4.5.1-configure-OpenIPMI.patch, 1.1, NONE collectd-4.5.1-include-collectd.d.patch, 1.2, NONE collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch, 1.2, NONE
Alan Pevec
apevec at fedoraproject.org
Wed May 20 10:41:21 UTC 2009
Author: apevec
Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27017
Modified Files:
.cvsignore collectd.spec sources
Added Files:
collectd-4.6.2-configure-OpenIPMI.patch
collectd-4.6.2-include-collectd.d.patch
Removed Files:
collectd-4.5.1-configure-OpenIPMI.patch
collectd-4.5.1-include-collectd.d.patch
collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
Log Message:
* Wed May 20 2009 Alan Pevec <apevec at redhat.com> 4.6.2-1
- New upstream version 4.6.2
http://collectd.org/news.shtml#news64
collectd-4.6.2-configure-OpenIPMI.patch:
--- NEW FILE collectd-4.6.2-configure-OpenIPMI.patch ---
--- configure.orig 2009-03-18 11:56:42.000000000 +0100
+++ configure 2009-05-20 11:05:33.000000000 +0200
@@ -40327,7 +40327,7 @@
then
{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread" >&5
$as_echo_n "checking for libOpenIPMIpthread... " >&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)"
@@ -40340,7 +40340,7 @@
then
{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread CFLAGS" >&5
$as_echo_n "checking for libOpenIPMIpthread CFLAGS... " >&6; }
- temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`"
+ temp_result="`$PKG_CONFIG --cflags OpenIPMI` -pthread"
if test "$?" = "0"
then
with_libopenipmipthread_cflags="$temp_result"
@@ -40356,7 +40356,7 @@
then
{ $as_echo "$as_me:$LINENO: checking for libOpenIPMIpthread LDFLAGS" >&5
$as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&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.6.2-include-collectd.d.patch:
--- NEW FILE collectd-4.6.2-include-collectd.d.patch ---
--- collectd-4.6.2/src/collectd.conf.in.orig 2009-03-18 11:55:39.000000000 +0100
+++ collectd-4.6.2/src/collectd.conf.in 2009-05-20 10:59:34.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
@@ -39,45 +38,33 @@
@BUILD_PLUGIN_DBI_TRUE at LoadPlugin dbi
@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_FILECOUNT_TRUE at LoadPlugin filecount
@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
@BUILD_PLUGIN_OPENVPN_TRUE at LoadPlugin openvpn
@BUILD_PLUGIN_ORACLE_TRUE at LoadPlugin oracle
- 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
@BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached
- 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
@@ -551,3 +538,5 @@
#<Chain "Main">
# Target "write"
#</Chain>
+
+Include "/etc/collectd.d"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 2 Mar 2009 23:43:02 -0000 1.7
+++ .cvsignore 20 May 2009 10:40:50 -0000 1.8
@@ -1 +1,2 @@
collectd-4.5.3.tar.bz2
+collectd-4.6.2.tar.bz2
Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- collectd.spec 3 Mar 2009 15:26:08 -0000 1.18
+++ collectd.spec 20 May 2009 10:40:50 -0000 1.19
@@ -1,17 +1,15 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 4.5.3
-Release: 2%{?dist}
+Version: 4.6.2
+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.5.1-include-collectd.d.patch
+Patch0: %{name}-%{version}-include-collectd.d.patch
# bug 468067 "pkg-config --libs OpenIPMIpthread" fails
-Patch1: %{name}-4.5.1-configure-OpenIPMI.patch
-# posted upstream
-Patch2: collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch
+Patch1: %{name}-%{version}-configure-OpenIPMI.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -153,7 +151,6 @@ This plugin collects information from vi
%setup -q
%patch0 -p1
%patch1 -p0
-%patch2 -p1
sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
@@ -410,6 +407,10 @@ fi
%changelog
+* Wed May 20 2009 Alan Pevec <apevec at redhat.com> 4.6.2-1
+- New upstream version 4.6.2
+ http://collectd.org/news.shtml#news64
+
* Tue Mar 03 2009 Alan Pevec <apevec at redhat.com> 4.5.3-2
- patch for strict-aliasing issue in liboping.c
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 2 Mar 2009 23:43:02 -0000 1.7
+++ sources 20 May 2009 10:40:50 -0000 1.8
@@ -1 +1,2 @@
f368200c4bedd64baba46094906e81ee collectd-4.5.3.tar.bz2
+ca1282372f15882ce07fdff6c61340d5 collectd-4.6.2.tar.bz2
--- collectd-4.5.1-configure-OpenIPMI.patch DELETED ---
--- collectd-4.5.1-include-collectd.d.patch DELETED ---
--- collectd-4.5.3-gcc-4.4-strict-aliasing-issue.patch DELETED ---
More information about the scm-commits
mailing list