- up to 1.9.1

[packages/flann.git] / flann.spec

diff --git a/flann.spec b/flann.spec
index 26a815cef70fdbd4cbd667bd86f05dff2f05d5ca..b0aa80aa60c6fadf50045059aa1a574951bff126 100644 (file)
--- a/flann.spec
+++ b/flann.spec
@@ -1,29 +1,36 @@
-# TODO: CUDA support (on bcond)
+# TODO: CUDA support, MPI (on bconds)
+#
+# Conditional build:
+%bcond_without openmp  # OpenMP support
+#
 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.7.1
+Version:       1.9.1
 Release:       1
 License:       BSD
 Group:         Libraries
-Source0:       http://people.cs.ubc.ca/~mariusm/uploads/FLANN/%{name}-%{version}-src.zip
-# Source0-md5: d780795f523eabda7c7ea09c6f5cf235
+Source0:       https://github.com/mariusmuja/flann/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 73adef1c7bf8e8b978987e7860926ea6
 Patch0:                %{name}-python.patch
 URL:           http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
 BuildRequires: cmake >= 2.6
+%{?with_openmp:BuildRequires:  gcc-c++ >= 6:4.2}
+BuildRequires: gtest-devel
 BuildRequires: hdf5-devel
+BuildRequires: latex2html
+%{?with_openmp:BuildRequires:  libgomp-devel}
 BuildRequires: libstdc++-devel
-BuildRequires: octave-devel
 BuildRequires: python >= 1:2.5
 BuildRequires: python-devel >= 1:2.5
 BuildRequires: rpmbuild(macros) >= 1.605
-BuildRequires: tbb-devel
+BuildRequires: texlive-format-pdflatex
+BuildRequires: texlive-latex
+BuildRequires: texlive-latex-bibtex
+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
@@ -51,8 +58,8 @@ Summary(pl.UTF-8):    Pliki nagłówkowe bibliotek FLANN
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      hdf5-devel
+Requires:      gtest-devel
 Requires:      libstdc++-devel
-Requires:      tbb-devel
 
 %description devel
 Header files for FLANN libraries.
@@ -72,18 +79,6 @@ 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
@@ -97,16 +92,19 @@ Python binding for FLANN library.
 Dowiązania Pythona do biblioteki FLANN.
 
 %prep
-%setup -q -n flann-%{version}-src
+%setup -q
 %patch0 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
-       -DBUILD_CUDA_LIB=OFF
+       -DBUILD_MATLAB_BINDINGS:BOOL=OFF \
+       -DBUILD_CUDA_LIB=OFF \
+       %{!?with_openmp:-DUSE_OPENMP=OFF}
 
 %{__make}
+%{__make} -C doc pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -121,13 +119,7 @@ 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}
-
-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
 
@@ -141,14 +133,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYING README.md
 %attr(755,root,root) %{_libdir}/libflann.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libflann.so.1.7
+%attr(755,root,root) %ghost %{_libdir}/libflann.so.1.9
 %attr(755,root,root) %{_libdir}/libflann_cpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libflann_cpp.so.1.7
-%attr(755,root,root) %{_libdir}/libflann_cpp-gd.so
+%attr(755,root,root) %ghost %{_libdir}/libflann_cpp.so.1.9
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/manual.pdf
+%doc build/doc/manual.pdf
 %attr(755,root,root) %{_libdir}/libflann.so
 %attr(755,root,root) %{_libdir}/libflann_cpp.so
 %{_includedir}/flann
@@ -159,16 +150,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libflann_s.a
 %{_libdir}/libflann_cpp_s.a
-%{_libdir}/libflann_cpp_s-gd.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
+%{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