diff --git a/opencv.spec b/opencv.spec index c4dab3a..3c70448 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.8.1 -Release: 1mamba +Release: 2mamba Summary: Collection of algorithms for computer vision Group: Development/Libraries Vendor: openmamba @@ -51,6 +51,7 @@ BuildRequires: libz-devel BuildRequires: qt6-qtbase-devel ## AUTOBUILDREQ-END Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} +Obsoletes: opencv41 < 4.2 %description OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision. @@ -59,6 +60,7 @@ OpenCV (Open Source Computer Vision) is a library of programming functions for r Summary: Collection of algorithms for computer vision Group: System/Libraries Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Obsoletes: libopencv41 < 4.2 %description -n lib%{name} OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision. @@ -71,6 +73,7 @@ Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} %ifnarch arm Requires: java-opencv = %{?epoch:%epoch:}%{version}-%{release} %endif +Obsoletes: libopencv41-devel < 4.2 %description -n lib%{name}-devel OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision. @@ -80,6 +83,7 @@ This package contains static libraries and header files need for development. Summary: Java bindings for apps which use OpenCV Group: Development/Libraries Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Obsoletes: java-opencv41 < 4.2 %description -n java-%{name} This package contains Python bindings for the OpenCV library. @@ -97,7 +101,7 @@ Obsoletes: python-cv < 4.7.0-2mamba %description -n python-cv-py2 This package contains Python bindings for the OpenCV library. -%package -n python-cv-py310 +%package -n python-cv-py3 Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} @@ -105,15 +109,17 @@ Requires: python-Pillow-py310 Requires: python-numpy-py310 Obsoletes: python-cv-py3 < 4.7.0-2mamba Obsoletes: python-cv-py36 <= 4.1.2-4mamba +Obsoletes: python-cv-py310 < 4.8.1-2mamba -%description -n python-cv-py310 +%description -n python-cv-py3 This package contains Python bindings for the OpenCV library. %debug_package %prep %setup -q -a1 -#% setup -q -D -T +#% setup -q +#-D -T #:<< _EOF %ifarch %{ix86} @@ -156,8 +162,8 @@ export JAVACMD=%{_jvmdir}/jdk/bin/java -DBUILD_SWIG_PYTHON_SUPPORT=1 \ -DINSTALL_C_EXAMPLES=0 \ -DCMAKE_CXX_FLAGS:STRING="%{optflags} -D__STDC_CONSTANT_MACROS" \ - -DPYTHON3_EXECUTABLE:PATH=%{__python310} \ - -DPYTHON3_PACKAGES_PATH:PATH=%{python310_sitelib} \ + -DPYTHON3_EXECUTABLE:PATH=%{__python3} \ + -DPYTHON3_PACKAGES_PATH:PATH=%{python3_sitelib} \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_ENABLE_NONFREE=ON \ -DOPENCV_EXTRA_MODULES_PATH=${PWD}/../opencv_contrib-%{version}/modules \ @@ -221,12 +227,15 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc %dir %{python27_sitelib}/cv2 %{python27_sitelib}/cv2/* -%files -n python-cv-py310 +%files -n python-cv-py3 %defattr(-,root,root) -%dir %{python310_sitelib}/cv2 -%{python310_sitelib}/cv2/* +%dir %{python3_sitelib}/cv2 +%{python3_sitelib}/cv2/* %changelog +* Thu Oct 19 2023 Silvan Calarco 4.8.1-2mamba +- obsolete opencv41 + * Thu Sep 28 2023 Automatic Build System 4.8.1-1mamba - automatic version update by autodist