Update to 4.10.9el5

- IPtables module broke again on EL5
- Build with python2.6 on EL5

3 files changed, 11 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 9aff7f8..4380c53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 collectd-4.8.3.tar.bz2
 /collectd-4.10.3.tar.bz2
+/collectd-4.10.9.tar.bz2
diff --git a/collectd.spec b/collectd.spec
index b6ad6c2..3e2a6d9 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,6 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.10.3
+Version: 4.10.9
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
@@ -33,9 +33,8 @@ BuildRequires: mysql-devel
 BuildRequires: OpenIPMI-devel
 BuildRequires: postgresql-devel
 BuildRequires: nut-devel
-#BuildRequires: iptables-devel
 BuildRequires: liboping-devel
-BuildRequires: python-devel
+BuildRequires: python26-devel
 BuildRequires: libgcrypt-devel
 
 %description
@@ -189,6 +188,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
     --disable-curl_json  \
     --disable-dbi  \
     --disable-gmond \
+    --disable-iptables \
     --disable-ipvs \
     --disable-java \
     --disable-memcachec \
@@ -228,7 +228,6 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
     --enable-hddtemp \
     --enable-interface \
     --enable-ipmi \
-    --enable-iptables \
     --enable-irq \
 %ifnarch ppc ppc64 sparc sparc64
     --enable-libvirt \
@@ -286,8 +285,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
     --enable-vserver \
     --enable-wireless \
     --enable-write_http \
-    --with-libiptc \
-    --with-python \
+    --with-python=%{_bindir}/python26 \
     --with-perl-bindings=INSTALLDIRS=vendor
 %{__make} %{?_smp_mflags}
 
@@ -413,7 +411,6 @@ fi
 %{_libdir}/collectd/filecount.so
 %{_libdir}/collectd/hddtemp.so
 %{_libdir}/collectd/interface.so
-%{_libdir}/collectd/iptables.so
 %{_libdir}/collectd/irq.so
 %{_libdir}/collectd/load.so
 %{_libdir}/collectd/logfile.so
@@ -585,6 +582,11 @@ fi
 %endif
 
 %changelog
+* Sun Apr 14 2013 Ruben Kerkhof <ruben@rubenkerkhof.com> 4.10.9-1
+- Update to 4.10.9
+- IPtables module broke again on EL5
+- Build with python2.6 on EL5
+
 * Sun Jun 19 2011 Kevin Fenzi <kevin@scrye.com> - 4.10.3-1
 - Update to 4.10.3
 - Add libgcrypt to fix bug #676059
diff --git a/sources b/sources
index 4c41b1f..8223f6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f17bfd7342af4f97f78c608f1d1eb1d  collectd-4.10.3.tar.bz2
+980dd3387508f9ad209df04a6f7a126c  collectd-4.10.9.tar.bz2