From 3b620d84b2c37a16663b8d8d184b7a53e5d9d88c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 08:11:25 +0100 Subject: [PATCH] libopencv45: move datadir conflicting with libopencv; require libopencv [release 4.5.5-3mamba;Sun Jan 22 2023] --- opencv45.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/opencv45.spec b/opencv45.spec index 3572841..5887433 100644 --- a/opencv45.spec +++ b/opencv45.spec @@ -2,7 +2,7 @@ %define javaver %(echo %version | cut -d. -f1-3 | tr -d .) Name: opencv45 Version: 4.5.5 -Release: 2mamba +Release: 3mamba Summary: Collection of algorithms for computer vision Group: Development/Libraries Vendor: openmamba @@ -51,6 +51,7 @@ OpenCV (Open Source Computer Vision) is a library of programming functions for r %package -n lib%{name} Summary: Collection of algorithms for computer vision Group: System/Libraries +Requires: libopencv #Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description -n lib%{name} @@ -172,12 +173,12 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc %defattr(-,root,root) %{_bindir}/opencv_* %{_bindir}/setup_vars_opencv4.sh +%dir %{_datadir}/opencv4 +%{_datadir}/opencv4/* %files -n lib%{name} %defattr(-,root,root) %{_libdir}/libopencv_*.so.* -%dir %{_datadir}/opencv4 -%{_datadir}/opencv4/* %files -n lib%{name}-devel %defattr(-,root,root) @@ -209,6 +210,9 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc #%{python3_sitelib}/cv2/* %changelog +* Sun Jan 22 2023 Silvan Calarco 4.5.5-3mamba +- libopencv45: move datadir conflicting with libopencv; require libopencv + * Sat Oct 22 2022 Silvan Calarco 4.5.5-2mamba - legacy package