commit 6238bbc2c6cd45aacbf2f10cbd0d90ec02cfcfa7
Author: Jan Rękorajski <[email protected]>
Date: Fri May 26 19:57:51 2017 +0200
- up to 1.9.1
- removed octave support which was actually matlab support and does not
build anymore
flann-lib.patch | 10 ----------
flann.spec | 51 +++++++++++++--------------------------------------
2 files changed, 13 insertions(+), 48 deletions(-)
---
diff --git a/flann.spec b/flann.spec
index fbba711..b0aa80a 100644
--- a/flann.spec
+++ b/flann.spec
@@ -6,15 +6,13 @@
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: 10
+Version: 1.9.1
+Release: 1
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}
@@ -23,18 +21,16 @@ 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)
-%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
@@ -83,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
@@ -108,18 +92,19 @@ 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
cd build
%cmake .. \
+ -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
@@ -134,12 +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}
-
-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
@@ -153,13 +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.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
@@ -171,11 +151,6 @@ 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
diff --git a/flann-lib.patch b/flann-lib.patch
deleted file mode 100644
index 16e6f84..0000000
--- a/flann-lib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- flann-1.8.3-src/cmake/flann_utils.cmake.orig 2012-12-23
12:52:22.000000000 +0100
-+++ flann-1.8.3-src/cmake/flann_utils.cmake 2012-12-28 18:50:08.599502844
+0100
-@@ -1,6 +1,6 @@
- macro(GET_OS_INFO)
- string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
-- set(FLANN_LIB_INSTALL_DIR "lib")
-+ set(FLANN_LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
- set(FLANN_INCLUDE_INSTALL_DIR
-
"include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
- endmacro(GET_OS_INFO)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/flann.git/commitdiff/6238bbc2c6cd45aacbf2f10cbd0d90ec02cfcfa7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
