rpms/collectd/F-10 collectd-4.4.4-configure-OpenIPMI.patch, NONE, 1.1 collectd.spec, 1.12, 1.13

[Alan Pevec]

Author: apevec

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

Modified Files:
	collectd.spec 
Added Files:
	collectd-4.4.4-configure-OpenIPMI.patch 
Log Message:
* Wed Oct 22 2008 Alan Pevec <apevec at redhat.com> 4.4.4-2
- workaround for https://bugzilla.redhat.com/show_bug.cgi?id=468067


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"


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-10/collectd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- collectd.spec	22 Oct 2008 15:55:51 -0000	1.12
+++ collectd.spec	22 Oct 2008 20:54:04 -0000	1.13
@@ -1,13 +1,15 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.4.4
-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
@@ -128,6 +130,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -335,6 +338,9 @@
 
 
 %changelog
+* Wed Oct 22 2008 Alan Pevec <apevec at redhat.com> 4.4.4-2
+- workaround for https://bugzilla.redhat.com/show_bug.cgi?id=468067
+
 * 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