[collectd/el6] Fix python module loading. Fixes bug #806585

[Kevin Fenzi]

commit db338c815783ea6df10889cabd9b51d5986fd842
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Mar 25 12:58:01 2012 -0600

    Fix python module loading. Fixes bug #806585

 .gitignore                                         |    1 +
 collectd-4.10.2-configure-OpenIPMI.patch           |   70 ------------
 ...tch => collectd-4.10.6-include-collectd.d.patch |   16 ++--
 collectd.spec                                      |   18 ++-
 libiptc-avoid-strict-aliasing-warnings.patch       |  113 --------------------
 sources                                            |    2 +-
 6 files changed, 23 insertions(+), 197 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9aff7f8..1caebb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 collectd-4.8.3.tar.bz2
 /collectd-4.10.3.tar.bz2
+/collectd-4.10.6.tar.bz2
diff --git a/collectd-4.10.2-include-collectd.d.patch b/collectd-4.10.6-include-collectd.d.patch
similarity index 56%
rename from collectd-4.10.2-include-collectd.d.patch
rename to collectd-4.10.6-include-collectd.d.patch
index 2e919a5..447d0b7 100644
--- a/collectd-4.10.2-include-collectd.d.patch
+++ b/collectd-4.10.6-include-collectd.d.patch
@@ -1,7 +1,8 @@
---- collectd-4.10.0/src/collectd.conf.in	2010-05-01 11:15:45.000000000 +0200
-+++ collectd-4.10.0/src/collectd.conf.in	2010-09-19 15:00:15.893887909 +0200
-@@ -116,7 +116,7 @@
- #@BUILD_PLUGIN_PYTHON_TRUE at LoadPlugin python
+diff -Nur collectd-4.10.6.orig/src/collectd.conf.in collectd-4.10.6/src/collectd.conf.in
+--- collectd-4.10.6.orig/src/collectd.conf.in	2012-02-19 03:05:01.000000000 -0700
++++ collectd-4.10.6/src/collectd.conf.in	2012-03-25 12:38:06.956243056 -0600
+@@ -120,7 +120,7 @@
+ #@BUILD_PLUGIN_PYTHON_TRUE@</LoadPlugin>
  #@BUILD_PLUGIN_ROUTEROS_TRUE at LoadPlugin routeros
  #@BUILD_PLUGIN_RRDCACHED_TRUE at LoadPlugin rrdcached
 - at LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
@@ -9,11 +10,12 @@
  #@BUILD_PLUGIN_SENSORS_TRUE at LoadPlugin sensors
  #@BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
  #@BUILD_PLUGIN_SNMP_TRUE at LoadPlugin snmp
-@@ -758,6 +758,7 @@
- #	CreateFiles true
+@@ -763,6 +763,8 @@
  #	CollectStatistics true
  #</Plugin>
-+Include "/etc/collectd.d"
  
++Include "/etc/collectd.d"
++
  #<Plugin rrdtool>
  #	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
+ #	CacheTimeout 120
diff --git a/collectd.spec b/collectd.spec
index 4608b22..0a92a51 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.10.3
-Release: 1%{?dist}
+Version: 4.10.6
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -9,7 +9,7 @@ URL: http://collectd.org/
 Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
 Source1: collectd-httpd.conf
 Source2: collection.conf
-Patch1: collectd-4.10.2-include-collectd.d.patch
+Patch1: collectd-4.10.6-include-collectd.d.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -33,7 +33,7 @@ BuildRequires: mysql-devel
 BuildRequires: OpenIPMI-devel
 BuildRequires: postgresql-devel
 BuildRequires: nut-devel
-#BuildRequires: iptables-devel
+BuildRequires: iptables-devel
 BuildRequires: liboping-devel
 BuildRequires: python-devel
 BuildRequires: libgcrypt-devel
@@ -182,7 +182,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
 
 %build
-%configure \
+%configure CFLAGS=-"DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'" \
     --disable-static \
     --disable-ascent \
     --disable-apple_sensors \
@@ -585,8 +585,14 @@ fi
 %endif
 
 %changelog
+* Sun Mar 25 2012 Kevin Fenzi <kevin at scrye.com> - 4.10.6-2
+- Fix python module loading. Fixes bug #806585
+
+* Fri Mar 02 2012 Kevin Fenzi <kevin at scrye.com> - 4.10.6-1
+- Update to 4.10.6
+
 * Sun Jul 19 2011 Kevin Fenzi <kevin at scrye.com> - 4.10.3-1
-- Update to 4.3.10
+- Update to 4.10.3
 - Add libgcrypt to fix bug #676059
 
 * Thu Mar 24 2011 Kevin Fenzi <kevin at scrye.com> - 4.10.2-2
diff --git a/sources b/sources
index 4c41b1f..883e2e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f17bfd7342af4f97f78c608f1d1eb1d  collectd-4.10.3.tar.bz2
+d446c399d839a32f2f581111d7256f8b  collectd-4.10.6.tar.bz2