rpms/collectd/devel collectd-4.5.1-configure-OpenIPMI.patch, NONE, 1.1 collectd.spec, 1.11, 1.12

[Alan Pevec]

Author: apevec

Update of /cvs/pkgs/rpms/collectd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10028

Modified Files:
	collectd.spec 
Added Files:
	collectd-4.5.1-configure-OpenIPMI.patch 
Log Message:
workaround for https://bugzilla.redhat.com/show_bug.cgi?id=468067


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"


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/devel/collectd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- collectd.spec	30 Nov 2008 10:06:55 -0000	1.11
+++ collectd.spec	30 Nov 2008 11:44:01 -0000	1.12
@@ -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 @@
 %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 @@
 %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 @@
 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 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -338,12 +344,14 @@
 %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 @@
 
 
 %changelog
+* Sun Nov 30 2008 Alan Pevec <apevec at redhat.com> 4.5.1-2
+- workaround for https://bugzilla.redhat.com/show_bug.cgi?id=468067
+
 * Sun Oct 22 2008 Alan Pevec <apevec at redhat.com> 4.5.1-1
 - New upstream version 4.5.1, bz# 470943
   http://collectd.org/news.shtml#news59