- new

Changed files:
    flann-python.patch -> 1.1
    flann.spec -> 1.1

diff --git a/flann-python.patch b/flann-python.patch
new file mode 100644 (file)
index 0000000..dc39ea3
--- /dev/null
+++ b/flann-python.patch
@@ -0,0 +1,18 @@
+--- flann-1.7.1-src/src/python/CMakeLists.txt.orig     2011-12-23 12:16:09.000000000 +0100
++++ flann-1.7.1-src/src/python/CMakeLists.txt  2012-02-02 17:07:06.212529926 +0100
+@@ -1,12 +1,12 @@
+ configure_file( setup.py.tpl setup.py )
+ 
+-install( DIRECTORY pyflann DESTINATION share/flann/python )
+-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.py DESTINATION share/flann/python )
++#install( DIRECTORY pyflann DESTINATION share/flann/python )
++#install( FILES ${CMAKE_CURRENT_BINARY_DIR}/setup.py DESTINATION share/flann/python )
+ 
+ 
+ # python instalation
+ if (PYTHON_EXECUTABLE)
+     install(CODE "execute_process(
+-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install
++        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install --optimize=2 --root=\$ENV{DESTDIR}
+         WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")")
+ endif()

diff --git a/flann.spec b/flann.spec
new file mode 100644 (file)
index 0000000..26a815c
--- /dev/null
+++ b/flann.spec
@@ -0,0 +1,174 @@
+# TODO: CUDA support (on bcond)
+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
+License:       BSD
+Group:         Libraries
+Source0:       http://people.cs.ubc.ca/~mariusm/uploads/FLANN/%{name}-%{version}-src.zip
+# Source0-md5: d780795f523eabda7c7ea09c6f5cf235
+Patch0:                %{name}-python.patch
+URL:           http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
+BuildRequires: cmake >= 2.6
+BuildRequires: hdf5-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: 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
+algorithms we found to work best for nearest neighbour search and a
+system for automatically choosing the best algorithm and optimum
+parameters depending on the dataset.
+
+FLANN is written in C++ and contains bindings for the following
+languages: C, MATLAB and Python.
+
+%description -l pl.UTF-8
+FLANN (Fast Library for Approximage Nearest Neighbours) to biblioteka
+do wykonywania szybkich przybliżonych wyszukiwań najbliższych sąsiadów
+w przestrzeniach o wielu wymiarach. Zawiera zbiór algorytmów, które
+sprawdzają się najlepiej w tym zastosowaniu oraz system automatycznego
+wyboru najlepszego algorytmu oraz optymalnych parametrów w zależności
+od zbioru danych.
+
+Biblioteka FLANN została napisana w C++ i zawiera dowiązania dla
+następujących języków: C, MATLAB i Python.
+
+%package devel
+Summary:       Header files for FLANN libraries
+Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek FLANN
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      hdf5-devel
+Requires:      libstdc++-devel
+Requires:      tbb-devel
+
+%description devel
+Header files for FLANN libraries.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek FLANN.
+
+%package static
+Summary:       Static FLANN libraries
+Summary(pl.UTF-8):     Statyczne biblioteki FLANN
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+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
+Group:         Libraries/Python
+Requires:      %{name} = %{version}-%{release}
+
+%description -n python-flann
+Python binding for FLANN library.
+
+%description -n python-flann -l pl.UTF-8
+Dowiązania Pythona do biblioteki FLANN.
+
+%prep
+%setup -q -n flann-%{version}-src
+%patch0 -p1
+
+%build
+install -d build
+cd build
+%cmake .. \
+       -DBUILD_CUDA_LIB=OFF
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} -C build install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/flann_example_*
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+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
+
+%py_postclean
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
+%files
+%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) %{_libdir}/libflann_cpp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libflann_cpp.so.1.7
+%attr(755,root,root) %{_libdir}/libflann_cpp-gd.so
+
+%files devel
+%defattr(644,root,root,755)
+%doc doc/manual.pdf
+%attr(755,root,root) %{_libdir}/libflann.so
+%attr(755,root,root) %{_libdir}/libflann_cpp.so
+%{_includedir}/flann
+%{_pkgconfigdir}/flann.pc
+%{_examplesdir}/%{name}-%{version}
+
+%files static
+%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
+%attr(755,root,root) %{py_sitedir}/pyflann/libflann.so
+%{py_sitescriptdir}/pyflann
+%{py_sitescriptdir}/flann-%{version}-py*.egg-info