Hello community,
here is the log from the commit of package opencv for openSUSE:Factory checked
in at 2018-01-16 09:32:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opencv (Old)
and /work/SRC/openSUSE:Factory/.opencv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv"
Tue Jan 16 09:32:34 2018 rev:70 rq:562894 version:3.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2017-12-03
10:10:41.364948426 +0100
+++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2018-01-16
09:32:38.944987115 +0100
@@ -1,0 +2,7 @@
+Mon Jan 8 09:35:37 UTC 2018 - tchva...@suse.com
+
+- Add conditionals for python2 and python3 to allow us enabling
+ only desired python variants when needed
+- Do not depend on sphinx as py2 and py3 seem to collide there
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opencv.spec ++++++
--- /var/tmp/diff_new_pack.xBmhxV/_old 2018-01-16 09:32:42.768808207 +0100
+++ /var/tmp/diff_new_pack.xBmhxV/_new 2018-01-16 09:32:42.772808020 +0100
@@ -1,7 +1,7 @@
#
# spec file for package opencv
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,6 +22,8 @@
%bcond_with tests
%bcond_without qt5
%bcond_without ffmpeg
+%bcond_without python2
+%bcond_without python3
Name: opencv
Version: 3.3.1
Release: 0
@@ -48,12 +50,6 @@
BuildRequires: libjpeg-devel
BuildRequires: openblas-devel
BuildRequires: pkgconfig
-%if 0%{?suse_version} > 1325
-BuildRequires: python2-numpy-devel
-%else
-BuildRequires: python-numpy-devel
-%endif
-BuildRequires: python3-numpy-devel
BuildRequires: tbb-devel
BuildRequires: unzip
BuildRequires: pkgconfig(IlmBase)
@@ -66,11 +62,21 @@
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libv4lconvert)
-BuildRequires: pkgconfig(python)
-BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(zlib)
Provides: opencv-qt5
Obsoletes: opencv-qt5
+%if %{with python2}
+BuildRequires: pkgconfig(python)
+%if 0%{?suse_version} > 1325
+BuildRequires: python2-numpy-devel
+%else
+BuildRequires: python-numpy-devel
+%endif
+%endif
+%if %{with python3}
+BuildRequires: python3-numpy-devel
+BuildRequires: pkgconfig(python3)
+%endif
%if %{with qt5}
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
@@ -89,9 +95,6 @@
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libswscale)
%endif
-%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
-BuildRequires: python-sphinx
-%endif
%description
OpenCV means Intel® Open Source Computer Vision Library. It is a collection of
C
@@ -232,33 +235,31 @@
%postun -n %{libname}%{soname} -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%{_bindir}/opencv_*
%{_datadir}/OpenCV
%exclude %{_datadir}/OpenCV/OpenCVConfig*.cmake
%files -n %{libname}%{soname}
-%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/opencv/
%{_includedir}/opencv2/
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/opencv.pc
%{_datadir}/OpenCV/OpenCVConfig*.cmake
+%if %{with python2}
%files -n python2-%{name}
-%defattr(-,root,root,-)
%{python_sitearch}/cv2.so
+%endif
+%if %{with python3}
%files -n python3-%{name}
-%defattr(-,root,root,-)
%{python3_sitearch}/cv2.%{py3_soflags}.so
+%endif
%files doc
-%defattr(-,root,root,-)
%{_docdir}/%{name}-doc/
%changelog
