From 9b8551755a42548d7d89c2474c03114b16f31ca8 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 08:10:49 +0100 Subject: [PATCH] fix double provide/obsolete for opencv-python [release 4.1.2-2mamba;Sat Nov 09 2019] --- opencv.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/opencv.spec b/opencv.spec index 956a402..3678f5d 100644 --- a/opencv.spec +++ b/opencv.spec @@ -2,7 +2,7 @@ %define javaver %(echo %version | cut -d. -f1-3 | tr -d .) Name: opencv Version: 4.1.2 -Release: 1mamba +Release: 2mamba Summary: Collection of algorithms for computer vision Group: Development/Libraries Vendor: openmamba @@ -69,7 +69,9 @@ This package contains the OpenCV static libraries. Summary: Devel package for %{name} Group: Development/Libraries Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} +%ifnarch arm Requires: java-opencv = %{?epoch:%epoch:}%{version}-%{release} +%endif %description -n lib%{name}-devel OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision. @@ -101,16 +103,12 @@ Group: Development/Libraries Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: python-Pillow-py36 Requires: python-numpy-py36 -Provides: opencv-python -Obsoletes: opencv-python %description -n python-cv-py36 This package contains Python bindings for the OpenCV library. %prep %setup -q -c -#-D -T -#:<< _EOF mv opencv-opencv-*/* . %ifarch %{ix86} @@ -119,7 +117,6 @@ mv opencv-opencv-*/* . #%patch3 -p1 %build -#:<< _EOF #-- Interfaces: # -- Use IPP: NO (Intel Performance Primitive) # -- Use TBB: NO (Threading Building Blocks library) @@ -206,6 +203,9 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc %endif %changelog +* Sat Nov 09 2019 Silvan Calarco 4.1.2-2mamba +- fix double provide/obsolete for opencv-python + * Fri Oct 11 2019 Automatic Build System 4.1.2-1mamba - automatic version update by autodist