[flann/f15: 4/5] Update to release 1.6.11

[rmattes]

commit 390bc7dc8f79b9e020ceccc4e05351e99e5aaebe
Author: Rich Mattes <richmattes at gmail.com>
Date:   Mon Dec 19 19:25:39 2011 -0500

    Update to release 1.6.11

 .gitignore |    1 +
 flann.spec |   21 +++++++++++++--------
 sources    |    2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1de4767..c3101ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /flann-1.6.7-src.zip
 /flann-1.6.9-src.zip
+/flann-1.6.11-src.zip
diff --git a/flann.spec b/flann.spec
index fc59fb9..4b44936 100644
--- a/flann.spec
+++ b/flann.spec
@@ -3,7 +3,7 @@
 %endif
 
 Name:           flann
-Version:        1.6.9
+Version:        1.6.11
 Release:        1%{?dist}
 Summary:        Fast Library for Approximate Nearest Neighbors
 
@@ -17,6 +17,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         flann-1.6.7.64bit.patch
 # This patch adds a missing version and soversion to flann.
 Patch1:         flann-1.6.9.fixsoname.patch
+# Prevent the buildsysem from running setup.py, not submitted uostream
+Patch2:         flann-1.6.11.fixpyflann.patch 
 BuildRequires:  cmake
 BuildRequires:  zlib-devel
 
@@ -71,14 +73,12 @@ Python bindings for flann
 %setup -q -n %{name}-%{version}-src
 %patch0 -p1 -b .64bit
 %patch1 -p0 -b .fixsoname
-
-# Python bindings want sourcedir/lib directory during build time
-mkdir lib
+%patch2 -p0 -b .fixpyflann
 
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%cmake -DBUILD_MATLAB_BINDINGS=OFF  -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_PYTHON_BINDINGS=true ..
+%cmake -DBUILD_MATLAB_BINDINGS=OFF  -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_PYTHON_BINDINGS=ON ..
 popd
 make %{?_smp_mflags} -C %{_target_platform}
 
@@ -86,13 +86,15 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
+rm -rf %{buildroot}%{_datadir}/%{name}/python
 
 # install the python bindings
+cp %{_target_platform}/src/python/setup.py src/python
 pushd src/python
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-python setup.py install --root=%{buildroot} --install-purelib=%{python_sitearch}
+%if 0%{?rhel} >= 6 || ! 0%{?rhel}
+python setup.py install --prefix=/usr --root=%{buildroot} --install-lib=%{python_sitearch}
 %else
-python26 setup.py install --root=%{buildroot} --install-purelib=%{python_sitearch}
+python26 setup.py install --prefix=/usr --root=%{buildroot} --install-lib=%{python_sitearch}
 %endif
 popd
 # get rid of duplicate shared libraries
@@ -130,6 +132,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/flann-%{version}*.egg-info
 
 %changelog
+* Mon Dec 19 2011 Rich Mattes <richmattes at gmail.com> - 1.6.11-1
+- Update to release 1.6.11
+
 * Fri May 13 2011 Rich Mattes <richmattes at gmail.com> - 1.6.9-1
 - Update to 1.6.9
 - Make flann-devel require boost-devel for boost/mpi.hpp
diff --git a/sources b/sources
index 7a7b805..329f300 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8598b952c48f323ca07d0c89845143fa  flann-1.6.9-src.zip
+5fd889b9f3777aa6e0d05b2546d25eb5  flann-1.6.11-src.zip