workaround for https://bugzilla.redhat.com/show_bug.cgi?id=468067

2 files changed, 41 insertions, 1 deletions

diff --git a/collectd-4.5.1-configure-OpenIPMI.patch b/collectd-4.5.1-configure-OpenIPMI.patch
new file mode 100644
index 0000000..2a2deab
--- /dev/null
+++ b/collectd-4.5.1-configure-OpenIPMI.patch
@@ -0,0 +1,29 @@
+--- 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"
diff --git a/collectd.spec b/collectd.spec
index 1b23991..e2dd7a0 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,13 +1,15 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 2%{?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
@@ -84,6 +86,7 @@ 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
@@ -91,6 +94,7 @@ 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
@@ -108,6 +112,7 @@ Requires:      collectd = %{version}-%{release}
 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
@@ -144,6 +149,7 @@ This plugin collects information from virtualized guests.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -338,12 +344,14 @@ fi
 %doc %{_mandir}/man5/collectd-perl.5*
 %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*
@@ -370,6 +378,9 @@ fi
 
 
 %changelog
+* Sun Nov 30 2008 Alan Pevec <apevec@redhat.com> 4.5.1-2
+- workaround for https://bugzilla.redhat.com/show_bug.cgi?id=468067
+
 * Sun Oct 22 2008 Alan Pevec <apevec@redhat.com> 4.5.1-1
 - New upstream version 4.5.1, bz# 470943
   http://collectd.org/news.shtml#news59