diff options
| author | Mike McGrath <mmcgrath@fedoraproject.org> | 2010-06-10 17:55:26 +0000 |
|---|---|---|
| committer | Mike McGrath <mmcgrath@fedoraproject.org> | 2010-06-10 17:55:26 +0000 |
| commit | a9e9c991430f6d14ddaa26bbb03627f06ba0a560 (patch) | |
| tree | ab13c9f5c6611ec4f0e857705c92709fb703ae23 | |
| parent | 1990944afd4e9b6dc3a136cd364149d7873fea23 (diff) | |
| download | collectd-a9e9c991430f6d14ddaa26bbb03627f06ba0a560.tar.gz collectd-a9e9c991430f6d14ddaa26bbb03627f06ba0a560.tar.xz collectd-a9e9c991430f6d14ddaa26bbb03627f06ba0a560.zip | |
Release bump and using proper patch namecollectd-4_10_0-2_el5
| -rw-r--r-- | collectd-4.5.1-configure-OpenIPMI.patch | 29 | ||||
| -rw-r--r-- | collectd-4.6.2-configure-OpenIPMI.patch | 30 | ||||
| -rw-r--r-- | collectd.spec | 4 |
3 files changed, 32 insertions, 31 deletions
diff --git a/collectd-4.5.1-configure-OpenIPMI.patch b/collectd-4.5.1-configure-OpenIPMI.patch deleted file mode 100644 index 2a2deab..0000000 --- a/collectd-4.5.1-configure-OpenIPMI.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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-4.6.2-configure-OpenIPMI.patch b/collectd-4.6.2-configure-OpenIPMI.patch new file mode 100644 index 0000000..8913ef9 --- /dev/null +++ b/collectd-4.6.2-configure-OpenIPMI.patch @@ -0,0 +1,30 @@ +diff -up ./configure.orig ./configure +--- ./configure.orig 2009-09-10 14:22:48.000000000 -0400 ++++ ./configure 2009-09-11 19:39:02.408651561 -0400 +@@ -27913,7 +27913,7 @@ if test "x$with_libopenipmipthread" = "x + then + { $as_echo "$as_me:${as_lineno-$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)" +@@ -27926,7 +27926,7 @@ if test "x$with_libopenipmipthread" = "x + then + { $as_echo "$as_me:${as_lineno-$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`" + if test "$?" = "0" + then + with_libopenipmipthread_cflags="$temp_result" +@@ -27942,7 +27942,7 @@ if test "x$with_libopenipmipthread" = "x + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread LDFLAGS" >&5 + $as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&6; } +- temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`" ++ temp_result="`$PKG_CONFIG --libs OpenIPMI`" + if test "$?" = "0" + then + with_libopenipmipthread_ldflags="$temp_result" diff --git a/collectd.spec b/collectd.spec index 7bacb56..55c84af 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.10.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -499,7 +499,7 @@ fi %endif %changelog -* Thu Jun 10 2010 Mike McGrath <mmcgrath@redhat.com> 4.10.0-1 +* Thu Jun 10 2010 Mike McGrath <mmcgrath@redhat.com> 4.10.0-2 - New upstram version * Tue Jun 08 2010 Alan Pevec <apevec@redhat.com> 4.8.5-1 |