X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=flann.spec;h=02a57e97e7547e3a65a573a5264ba0ef6e485bcc;hb=HEAD;hp=af7a1f075eace08141eaaf959e3af4f0e706aa32;hpb=9a6446a02f8f8382817e2d26d4900a948b0883d0;p=packages%2Fflann.git

diff --git a/flann.spec b/flann.spec
index af7a1f0..02a57e9 100644
--- a/flann.spec
+++ b/flann.spec
@@ -1,31 +1,40 @@
 # TODO: CUDA support, MPI (on bconds)
 #
 # Conditional build:
-%bcond_without	gomp	# OpenMP support
+%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.8.4
-Release:	6
+Version:	1.9.2
+Release:	4
 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:	a0ecd46be2ee11a68d2a7d9c6b4ce701
+#Source0Download: https://github.com/flann-lib/flann/tags
+Source0:	https://github.com/flann-lib/flann/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	d187585a55676e2b12bbb7ea04d1398f
 Patch0:		%{name}-python.patch
-Patch1:		%{name}-lib.patch
-URL:		http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
+Patch1:		%{name}-libdir.patch
+Patch2:		cmake.patch
+Patch3:		pc-lz4-flags.patch
+URL:		https://github.com/flann-lib/flann
 BuildRequires:	cmake >= 2.6
-%{?with_gomp:BuildRequires:	gcc-c++ >= 6:4.2}
+%{?with_openmp:BuildRequires:	gcc-c++ >= 6:4.2}
 BuildRequires:	gtest-devel
 BuildRequires:	hdf5-devel
-%{?with_gomp:BuildRequires:	libgomp-devel}
+BuildRequires:	latex2html
+%{?with_openmp:BuildRequires:	libgomp-devel}
 BuildRequires:	libstdc++-devel
+BuildRequires:	lz4-devel
 BuildRequires:	octave-devel
 BuildRequires:	python >= 1:2.5
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	texlive-format-pdflatex
+BuildRequires:	texlive-latex
+BuildRequires:	texlive-latex-bibtex
+BuildRequires:	texlive-makeindex
+BuildRequires:	texlive-xetex
 BuildRequires:	unzip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,6 +70,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	hdf5-devel
 Requires:	gtest-devel
 Requires:	libstdc++-devel
+Requires:	lz4-devel
 
 %description devel
 Header files for FLANN libraries.
@@ -105,18 +115,21 @@ Python binding for FLANN library.
 Dowiązania Pythona do biblioteki FLANN.
 
 %prep
-%setup -q -n flann-%{version}-src
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
 	-DBUILD_CUDA_LIB=OFF \
-	%{!?with_gomp:-DUSE_OPENMP=OFF}
+	%{!?with_openmp:-DUSE_OPENMP=OFF}
 
 %{__make}
+%{__make} -C doc pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -133,11 +146,10 @@ cp -p examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 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%{_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
 
@@ -151,17 +163,18 @@ 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.8
+%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.8
+%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
 %{_pkgconfigdir}/flann.pc
+%{_libdir}/cmake/flann
 %{_examplesdir}/%{name}-%{version}
 
 %files static
@@ -177,6 +190,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