[flann/el6/master] - Disabled hdf and ctest requirements for el6 - Explicit python26 dependency for el5

[rmattes]

commit 37a0fbf6ae3ecc22eb6a5a2bd068b4cee927c08b
Author: Rich Mattes <richmattes at gmail.com>
Date:   Fri Feb 4 00:14:02 2011 -0500

    - Disabled hdf and ctest requirements for el6
    - Explicit python26 dependency for el5

 flann-1.6.7.ppc64.patch |    2 +-
 flann.spec              |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/flann-1.6.7.ppc64.patch b/flann-1.6.7.ppc64.patch
index 5e7b51a..e97883c 100644
--- a/flann-1.6.7.ppc64.patch
+++ b/flann-1.6.7.ppc64.patch
@@ -5,7 +5,7 @@ diff -up ./cmake/flann_utils.cmake.ppc64 ./cmake/flann_utils.cmake
      if(OS_IS_LINUX)
          if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
              set(FLANN_LIB_INSTALL_DIR "lib64")
-+        if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
++        elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
 +            set(FLANN_LIB_INSTALL_DIR "lib64")           
          else(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
              set(FLANN_LIB_INSTALL_DIR "lib")
diff --git a/flann.spec b/flann.spec
index 00e6878..364d81e 100644
--- a/flann.spec
+++ b/flann.spec
@@ -16,6 +16,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # This patch removes an exit() in a shared library.  This issue
 # is fixed upstream
 Patch0:         flann-1.6.7.noexit.patch
+# This patch fixes the library install path on ppc64 systems
+Patch1:         flann-1.6.7.ppc64.patch
 
 BuildRequires:  cmake
 BuildRequires:  zlib-devel
@@ -67,11 +69,12 @@ Python bindings for flann
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch0 -p0 -b .noexit
+%patch1 -p0 -b .ppc64
 
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%cmake -DBUILD_MATLAB_BINDINGS=OFF  -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_PYTHON_BINDINGS=true -DFLANN_LIB_INSTALL_DIR=%{_libdir}  ..
+%cmake -DBUILD_MATLAB_BINDINGS=OFF  -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_PYTHON_BINDINGS=true ..
 popd
 make %{?_smp_mflags} -C %{_target_platform}