From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 26 May 2017 18:34:50 +0000 (+0200)
Subject: - restore matlab/octave support, mkoctfile had incorrect paths hardcoded
X-Git-Tag: auto/th/flann-1.9.1-2~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fflann.git;a=commitdiff_plain;h=fb680b2250fccd870995aaf825a5bf851386fa29

- restore matlab/octave support, mkoctfile had incorrect paths hardcoded
- rel 2
---

diff --git a/flann.spec b/flann.spec
index b0aa80a..2975165 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.9.1
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	https://github.com/mariusmuja/flann/archive/%{version}/%{name}-%{version}.tar.gz
@@ -31,6 +31,9 @@ BuildRequires:	texlive-makeindex
 BuildRequires:	unzip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		octave_m_dir	%(octave-config --m-site-dir)
+%define		octave_oct_dir	%(octave-config --oct-site-dir)
+
 %description
 FLANN is a library for performing fast approximate nearest neighbour
 searches in high dimensional spaces. It contains a collection of
@@ -79,6 +82,18 @@ Static FLANN libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki FLANN.
 
+%package -n octave-flann
+Summary:	Octave binding for FLANN library
+Summary(pl.UTF-8):	Dowiązania języka Octave do biblioteki FLANN
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+
+%description -n octave-flann
+Octave binding for FLANN library.
+
+%description -n octave-flann -l pl.UTF-8
+Dowiązania języka Octave do biblioteki FLANN.
+
 %package -n python-flann
 Summary:	Python binding for FLANN library
 Summary(pl.UTF-8):	Dowiązania Pythona do biblioteki FLANN
@@ -99,7 +114,6 @@ Dowiązania Pythona do biblioteki FLANN.
 install -d build
 cd build
 %cmake .. \
-	-DBUILD_MATLAB_BINDINGS:BOOL=OFF \
 	-DBUILD_CUDA_LIB=OFF \
 	%{!?with_openmp:-DUSE_OPENMP=OFF}
 
@@ -119,6 +133,11 @@ cp -p examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/flann
 
+install -d $RPM_BUILD_ROOT{%{octave_m_dir},%{octave_oct_dir}}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/flann/octave/test*.m
+%{__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}
+
 %{__mv} $RPM_BUILD_ROOT%{py_sitedir}/pyflann/lib/libflann.so $RPM_BUILD_ROOT%{py_sitedir}/pyflann
 
 %py_postclean
@@ -151,6 +170,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libflann_s.a
 %{_libdir}/libflann_cpp_s.a
 
+%files -n octave-flann
+%defattr(644,root,root,755)
+%{octave_m_dir}/flann*.m
+%attr(755,root,root) %{octave_oct_dir}/nearest_neighbors.mex
+
 %files -n python-flann
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/pyflann