- update BRs

[packages/flann.git] / flann.spec

diff --git a/flann.spec b/flann.spec
index 26a815cef70fdbd4cbd667bd86f05dff2f05d5ca..fbba7118ac1d4f65ddce3101575ad64bbc5b5d78 100644 (file)
--- a/flann.spec
+++ b/flann.spec
@@ -1,23 +1,34 @@
-# 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
-Release:       1
+Version:       1.8.4
+Release:       10
 License:       BSD
 Group:         Libraries
+#Source0Download: http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
 Source0:       http://people.cs.ubc.ca/~mariusm/uploads/FLANN/%{name}-%{version}-src.zip
-# Source0-md5: d780795f523eabda7c7ea09c6f5cf235
+# Source0-md5: a0ecd46be2ee11a68d2a7d9c6b4ce701
 Patch0:                %{name}-python.patch
+Patch1:                %{name}-lib.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-latex
+BuildRequires: texlive-makeindex
 BuildRequires: unzip
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,8 +62,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.
@@ -99,12 +110,14 @@ Dowiązania Pythona do biblioteki FLANN.
 %prep
 %setup -q -n flann-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
-       -DBUILD_CUDA_LIB=OFF
+       -DBUILD_CUDA_LIB=OFF \
+       %{!?with_openmp:-DUSE_OPENMP=OFF}
 
 %{__make}
 
@@ -126,8 +139,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
 
@@ -141,10 +153,9 @@ 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.8
 %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.8
 
 %files devel
 %defattr(644,root,root,755)
@@ -159,7 +170,6 @@ 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)
@@ -169,6 +179,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