[flann/el5: 12/12] Merge branch 'el6' into el5

[rmattes]

commit c85403c4e92879703f15f2993ec70143519b00c2
Merge: b8d861b e688d8f
Author: Rich Mattes <richmattes at gmail.com>
Date:   Mon Dec 19 20:09:02 2011 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	flann.spec
    	sources

 .gitignore                  |    2 ++
 flann-1.6.7.64bit.patch     |   16 ++++++++++++++++
 flann-1.6.9.fixsoname.patch |   12 ++++++++++++
 flann.spec                  |   36 +++++++++++++++++++++++-------------
 sources                     |    2 +-
 5 files changed, 54 insertions(+), 14 deletions(-)
---
diff --cc flann.spec
index 13755e7,7c4d178..3efc172
--- a/flann.spec
+++ b/flann.spec
@@@ -123,6 -130,13 +130,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
 -
  * Thu Feb 03 2011 Rich Mattes <richmattes at gmail.com> - 1.6.7-4
  - Disabled hdf and ctest requirements for el6
  - Explicit python26 dependency for el5