fix double provide/obsolete for opencv-python [release 4.1.2-2mamba;Sat Nov 09 2019]
This commit is contained in:
parent
4b1c86abad
commit
9b8551755a
12
opencv.spec
12
opencv.spec
@ -2,7 +2,7 @@
|
|||||||
%define javaver %(echo %version | cut -d. -f1-3 | tr -d .)
|
%define javaver %(echo %version | cut -d. -f1-3 | tr -d .)
|
||||||
Name: opencv
|
Name: opencv
|
||||||
Version: 4.1.2
|
Version: 4.1.2
|
||||||
Release: 1mamba
|
Release: 2mamba
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -69,7 +69,9 @@ This package contains the OpenCV static libraries.
|
|||||||
Summary: Devel package for %{name}
|
Summary: Devel package for %{name}
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
|
%ifnarch arm
|
||||||
Requires: java-opencv = %{?epoch:%epoch:}%{version}-%{release}
|
Requires: java-opencv = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n lib%{name}-devel
|
%description -n lib%{name}-devel
|
||||||
OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision.
|
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: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||||
Requires: python-Pillow-py36
|
Requires: python-Pillow-py36
|
||||||
Requires: python-numpy-py36
|
Requires: python-numpy-py36
|
||||||
Provides: opencv-python
|
|
||||||
Obsoletes: opencv-python
|
|
||||||
|
|
||||||
%description -n python-cv-py36
|
%description -n python-cv-py36
|
||||||
This package contains Python bindings for the OpenCV library.
|
This package contains Python bindings for the OpenCV library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q -c
|
||||||
#-D -T
|
|
||||||
#:<< _EOF
|
|
||||||
mv opencv-opencv-*/* .
|
mv opencv-opencv-*/* .
|
||||||
|
|
||||||
%ifarch %{ix86}
|
%ifarch %{ix86}
|
||||||
@ -119,7 +117,6 @@ mv opencv-opencv-*/* .
|
|||||||
#%patch3 -p1
|
#%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#:<< _EOF
|
|
||||||
#-- Interfaces:
|
#-- Interfaces:
|
||||||
# -- Use IPP: NO (Intel Performance Primitive)
|
# -- Use IPP: NO (Intel Performance Primitive)
|
||||||
# -- Use TBB: NO (Threading Building Blocks library)
|
# -- Use TBB: NO (Threading Building Blocks library)
|
||||||
@ -206,6 +203,9 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Nov 09 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.2-2mamba
|
||||||
|
- fix double provide/obsolete for opencv-python
|
||||||
|
|
||||||
* Fri Oct 11 2019 Automatic Build System <autodist@mambasoft.it> 4.1.2-1mamba
|
* Fri Oct 11 2019 Automatic Build System <autodist@mambasoft.it> 4.1.2-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user