- added levmar patch, build with LEVMAR optimization support

diff --git a/teem-levmar.patch b/teem-levmar.patch
new file mode 100644 (file)
index 0000000..826837d
--- /dev/null
+++ b/teem-levmar.patch
@@ -0,0 +1,9 @@
+--- teem-1.11.0-src/CMake/FindLEVMAR.cmake.orig        2012-12-20 15:07:08.000000000 +0100
++++ teem-1.11.0-src/CMake/FindLEVMAR.cmake     2013-01-25 16:54:27.400261695 +0100
+@@ -1,5 +1,5 @@
+ 
+-FIND_PATH(LEVMAR_INCLUDE_DIR lm.h
++FIND_PATH(LEVMAR_INCLUDE_DIR levmar.h
+   /usr/local/include
+   /usr/include
+ )

diff --git a/teem.spec b/teem.spec
index f2836ad5390072191bf7ac7ac406891e7f4e2c7a..015aed1c0cf39000f8d0c9fd4955bb6f18631160 100644 (file)
--- a/teem.spec
+++ b/teem.spec
@@ -1,4 +1,7 @@
-# TODO: levmar <http://www.ics.forth.gr/~lourakis/levmar/>
+#
+# Conditional build:
+%bcond_without levmar  # LEVMAR optimization algorithm
+#
 Summary:       Teem - tools to process and visualize scientific data and images
 Summary(pl.UTF-8):     Teem - narzędzia do przetwarzania i wizualizacji danych i obrazów naukowych
 Name:          teem
@@ -9,10 +12,12 @@ Group:               Libraries
 Source0:       http://downloads.sourceforge.net/teem/%{name}-%{version}-src.tar.gz
 # Source0-md5: 6b9737e8b7640e18eaf281e830fe59d1
 Patch0:                %{name}-lib.patch
+Patch1:                %{name}-levmar.patch
 URL:           http://teem.sourceforge.net/
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.4
 BuildRequires: fftw3-devel
+%{?with_levmar:BuildRequires:  levmar-devel}
 BuildRequires: libpng-devel
 BuildRequires: rpmbuild(macros) >= 1.605
 BuildRequires: zlib-devel
@@ -40,10 +45,12 @@ Pliki nagłówkowe biblioteki Teem.
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
 %cmake . \
-       -DTeem_FFTW3=ON
+       -DTeem_FFTW3=ON \
+       %{?with_levmar:-DTeem_LEVMAR=ON}
 %{__make}
 
 %install