- BR octave-devel

[packages/flann.git] / flann.spec

diff --git a/flann.spec b/flann.spec
index 782d24961b6310af2f4d3deca6d01dd95db4d884..054fa136b10e4ec195cf340269b93f52f338ce6d 100644 (file)
--- a/flann.spec
+++ b/flann.spec
@@ -6,26 +6,29 @@
 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:       9
+Version:       1.9.1
+Release:       2
 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
+Source0:       https://github.com/mariusmuja/flann/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 73adef1c7bf8e8b978987e7860926ea6
 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: texlive-format-pdflatex
+BuildRequires: texlive-latex
+BuildRequires: texlive-latex-bibtex
+BuildRequires: texlive-makeindex
 BuildRequires: unzip
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -105,9 +108,8 @@ Python binding for FLANN library.
 Dowiązania Pythona do biblioteki FLANN.
 
 %prep
-%setup -q -n flann-%{version}-src
+%setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
@@ -117,6 +119,7 @@ cd build
        %{!?with_openmp:-DUSE_OPENMP=OFF}
 
 %{__make}
+%{__make} -C doc pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -133,10 +136,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}
 
-mv $RPM_BUILD_ROOT%{py_sitedir}/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
 
@@ -150,13 +153,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.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