- fix python bindings install

- rel 8

diff --git a/flann-python.patch b/flann-python.patch
index dc39ea3bf3bd457aedc8205768ae34f71c26bc79..1c0004fbc0da0faa173cb956f5987ba52273c659 100644 (file)
--- a/flann-python.patch
+++ b/flann-python.patch
@@ -13,6 +13,6 @@
  if (PYTHON_EXECUTABLE)
      install(CODE "execute_process(
 -        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install
-+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install --optimize=2 --root=\$ENV{DESTDIR}
++        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install --optimize=2 --root=\$ENV{DESTDIR} --prefix=${CMAKE_INSTALL_PREFIX}
          WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
  endif()

diff --git a/flann.spec b/flann.spec
index 086d7adc3f3c611c7186c2ee1bc274a8fe62ddd1..c49f2a55e8dd9124e12f95f94630cd166cebf2f2 100644 (file)
--- a/flann.spec
+++ b/flann.spec
@@ -7,7 +7,7 @@ Summary:        FLANN - Fast Library for Approximate Nearest Neighbours
 Summary(pl.UTF-8):     FLANN - szybka biblioteka do przybliżonego wyszukiwania najbliższych sąsiadów
 Name:          flann
 Version:       1.8.4
-Release:       7
+Release:       8
 License:       BSD
 Group:         Libraries
 #Source0Download: http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
@@ -136,8 +136,7 @@ install -d $RPM_BUILD_ROOT{%{octave_m_dir},%{octave_oct_dir}}
 mv $RPM_BUILD_ROOT%{_datadir}/flann/octave/*.m $RPM_BUILD_ROOT%{octave_m_dir}
 mv $RPM_BUILD_ROOT%{_datadir}/flann/octave/*.mex $RPM_BUILD_ROOT%{octave_oct_dir}
 
-install -d $RPM_BUILD_ROOT%{py_sitedir}/pyflann
-mv $RPM_BUILD_ROOT%{py_sitescriptdir}/pyflann/lib/libflann.so $RPM_BUILD_ROOT%{py_sitedir}/pyflann
+mv $RPM_BUILD_ROOT%{py_sitedir}/pyflann/lib/libflann.so $RPM_BUILD_ROOT%{py_sitedir}/pyflann
 
 %py_postclean
 
@@ -177,6 +176,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python-flann
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/pyflann
+%{py_sitedir}/pyflann/*.py[co]
 %attr(755,root,root) %{py_sitedir}/pyflann/libflann.so
-%{py_sitescriptdir}/pyflann
-%{py_sitescriptdir}/flann-%{version}-py*.egg-info
+%{py_sitedir}/flann-%{version}-py*.egg-info