commit ba4947161f9de322e096ffa55b2bbe0e13649f13 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Fri Dec 18 21:07:33 2015 +0100
- fix python bindings install - rel 8 flann-python.patch | 2 +- flann.spec | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) --- diff --git a/flann.spec b/flann.spec index 086d7ad..c49f2a5 100644 --- 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 diff --git a/flann-python.patch b/flann-python.patch index dc39ea3..1c0004f 100644 --- 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() ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/flann.git/commitdiff/ba4947161f9de322e096ffa55b2bbe0e13649f13 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit