- link sensors plugin with libsensors

Changed files:
    collectd-as_needed.patch -> 1.1
    collectd.spec -> 1.72

diff --git a/collectd-as_needed.patch b/collectd-as_needed.patch
new file mode 100644 (file)
index 0000000..d7fda35
--- /dev/null
+++ b/collectd-as_needed.patch
@@ -0,0 +1,12 @@
+diff -urN collectd-4.7.0/src/Makefile.am collectd-4.7.0.new/src/Makefile.am
+--- collectd-4.7.0/src/Makefile.am     2009-05-12 08:59:15.000000000 +0200
++++ collectd-4.7.0.new/src/Makefile.am 2009-06-02 20:22:02.222297769 +0200
+@@ -765,7 +765,7 @@
+ sensors_la_SOURCES = sensors.c
+ sensors_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBSENSORS_CFLAGS)
+ sensors_la_LDFLAGS = -module -avoid-version
+-sensors_la_LIBADD = $(BUILD_WITH_LIBSENSORS_LDFLAGS)
++sensors_la_LIBADD = $(BUILD_WITH_LIBSENSORS_LDFLAGS) -lsensors
+ collectd_LDADD += "-dlopen" sensors.la
+ collectd_DEPENDENCIES += sensors.la
+ endif

diff --git a/collectd.spec b/collectd.spec
index 5df2bf3c29e6ef0ad54401adde41f2565a0c3543..338a310cad35ad17ff094839c0d023c036295b95 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -38,6 +38,7 @@ Source4:      %{name}-lighttpd.conf
 Source10:      %{name}-df.conf
 Source11:      %{name}-rrdtool.conf
 Patch0:                %{name}-collection.patch
+Patch1:                %{name}-as_needed.patch
 URL:           http://collectd.org/
 %{?with_ipmi:BuildRequires:    OpenIPMI-devel >= 2.0.14-3}
 BuildRequires: autoconf
@@ -886,6 +887,7 @@ This plugin collectd data provided by XMMS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}