X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=opencv.spec;h=51ef98923620794fcb1d41448196f4e70841ad1c;hb=54ee5fb58c264a029c626d2a944fccec1b28afe1;hp=2e861912ccf41ab3e3bd2ed30ff21b97dfa5525c;hpb=79883058f314778fa464267c9ff802bb63d96993;p=packages%2Fopencv.git

diff --git a/opencv.spec b/opencv.spec
index 2e86191..51ef989 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -17,7 +17,7 @@
 %bcond_with	opencl_amdblas	# AMD OpenCL BLAS routines
 %bcond_with	opencl_amdfft	# AMD OpenCL FFT routines
 %bcond_without	opengl		# OpenGL support
-%bcond_without	gomp		# OpenMP support (available when not using tbb)
+%bcond_without	openmp		# OpenMP support (available when not using tbb)
 %bcond_without	examples	# Install examples
 # - bindings
 %bcond_without	java		# Java binding
@@ -44,7 +44,7 @@ Summary:	A library of programming functions mainly aimed at real time computer v
 Summary(pl.UTF-8):	Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym
 Name:		opencv
 Version:	2.4.11
-Release:	4
+Release:	6
 Epoch:		1
 %if %{with unicap} || %{with xine}
 License:	GPL (enforced by used libraries), BSD (opencv itself)
@@ -81,7 +81,7 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	doxygen
 BuildRequires:	eigen3 >= 3
 %{?with_ffmpeg:BuildRequires:	ffmpeg-devel >= 0.7}
-%{?with_gomp:BuildRequires:	gcc-c++ >= 6:4.2}
+%{?with_openmp:BuildRequires:	gcc-c++ >= 6:4.2}
 %if %{with gstreamer}
 BuildRequires:	gstreamer-devel >= 1.0
 BuildRequires:	gstreamer-plugins-base-devel >= 1.0
@@ -89,7 +89,7 @@ BuildRequires:	gstreamer-plugins-base-devel >= 1.0
 BuildRequires:	jasper-devel
 %{?with_java:BuildRequires:	jdk}
 BuildRequires:	libdc1394-devel >= 2
-%{?with_gomp:BuildRequires:	libgomp-devel}
+%{?with_openmp:BuildRequires:	libgomp-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libraw1394-devel
@@ -315,7 +315,7 @@ fi
 	%{!?with_opencl_amdblas:-DWITH_OPENCLAMDBLAS=OFF} \
 	%{!?with_opencl_amdfft:-DWITH_OPENCLAMDFFT=OFF} \
 	%{?with_opengl:-DWITH_OPENGL=ON} \
-	%{?with_gomp:-DWITH_OPENMP=ON} \
+	%{?with_openmp:-DWITH_OPENMP=ON} \
 	%{?with_openni:-DWITH_OPENNI=ON} \
 	%{?with_pvapi:-DPVAPI_LIBRARY=%{_libdir}/libPvAPI.so}%{!?with_pvapi:-DWITH_PVAPI=OFF} \
 	%{?with_qt:-DWITH_QT=ON %{?with_opengl:-DWITH_QT_OPENGL=ON} -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4} \