- remove cmake install directory arch dependant hackery

[packages/opencv.git] / opencv.spec

diff --git a/opencv.spec b/opencv.spec
index d4c0bd39c7764f8fbcb8b1b734c645ce4c0cfd79..3ee1a71c1cc0cf1d8f0eaeb270dea7ee361201de 100644 (file)
--- a/opencv.spec
+++ b/opencv.spec
@@ -34,10 +34,10 @@
 # - other modules
 %bcond_without vtk             # VTK library support (opencv_viz module)
 
-%ifarch pentium3 pentium4 %{x8664}
+%ifarch pentium3 pentium4 %{x8664} x32
 %define                with_sse        1
 %endif
-%ifarch pentium4 %{x8664}
+%ifarch pentium4 %{x8664} x32
 %define                with_sse2       1
 %endif
 Summary:       A library of programming functions mainly aimed at real time computer vision
@@ -63,6 +63,8 @@ Patch5:               %{name}-ximea.patch
 Patch6:                %{name}-ocl-fft.patch
 Patch7:                java-ant-sourcelevel.patch
 Patch8:                %{name}-shared.patch
+Patch9:                no-sysctl.patch
+Patch10:       cmake-install-path.patch
 URL:           http://www.opencv.org/
 %{?with_pvapi:BuildRequires:   AVT_GigE_SDK-devel}
 %{?with_opencl:BuildRequires:  OpenCL-devel}
@@ -275,6 +277,8 @@ Wiązania Pythona do OpenCV.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 install -d build
@@ -339,6 +343,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/OpenCV/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 cp -p build/unix-install/opencv.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
+# disable completeness check incompatible with split packaging
+%{__sed} -i -e '/^foreach(target .*IMPORT_CHECK_TARGETS/,/^endforeach/d' $RPM_BUILD_ROOT%{_datadir}/OpenCV/OpenCVModules.cmake
+
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean