[flann/f18] Enabled tbb support

rmattes rmattes at fedoraproject.org
Mon Oct 8 22:18:26 UTC 2012


commit 5cf01d8c01b2f7e47c1a974a19ed1d8cdf4e11a2
Author: Rich Mattes <richmattes at gmail.com>
Date:   Fri Sep 28 21:14:24 2012 -0400

    Enabled tbb support

 flann.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/flann.spec b/flann.spec
index c2a8c64..334b1cd 100644
--- a/flann.spec
+++ b/flann.spec
@@ -4,7 +4,7 @@
 
 Name:           flann
 Version:        1.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fast Library for Approximate Nearest Neighbors
 
 Group:          Development/Libraries
@@ -17,14 +17,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         flann-1.6.7.64bit.patch
 # This patch adds a missing version and soversion to flann.
 Patch1:         flann-1.6.9.fixsoname.patch
-# Prevent the buildsysem from running setup.py, not submitted uostream
+# Prevent the buildsysem from running setup.py, not submitted upstream
 Patch2:         flann-1.6.11.fixpyflann.patch 
+# Patch to fix detection of tbb.  Not submitted upstream
+Patch3:         flann-1.7.1-tbb.patch
 BuildRequires:  cmake
 BuildRequires:  zlib-devel
 
 %if 0%{?fedora}
-BuildRequires:  hdf5-devel  
+BuildRequires:  hdf5-devel
 BuildRequires:  gtest-devel
+BuildRequires:  tbb-devel
 %endif
 
 %if 0%{?rhel} >= 6 || 0%{?fedora}
@@ -74,6 +77,7 @@ Python bindings for flann
 %patch0 -p1 -b .64bit
 %patch1 -p0 -b .fixsoname
 %patch2 -p0 -b .fixpyflann
+%patch3 -p0 -b .tbb
 
 %build
 mkdir %{_target_platform}
@@ -132,6 +136,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/flann-%{version}*.egg-info
 
 %changelog
+* Fri Sep 28 2012 Rich Mattes <richmattes at gmail.com> - 1.7.1-4
+- Enabled tbb support
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list