[packages/opencv] - versioned Obsoletes, dependency for noarch subpackages

qboosh qboosh at pld-linux.org
Sat Jul 8 11:07:47 CEST 2023


commit 1f51acaa6d7083989fd5ede2b0d85c9724da3f3f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 8 09:54:29 2023 +0200

    - versioned Obsoletes, dependency for noarch subpackages

 opencv.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/opencv.spec b/opencv.spec
index a1d5248..e146465 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -165,6 +165,7 @@ BuildRequires:	python-numpy-devel
 BuildRequires:	python3 >= 1:3.2
 BuildRequires:	python3-devel >= 1:3.2
 BuildRequires:	python3-numpy-devel
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.606
 BuildRequires:	sed >= 4.0
@@ -256,7 +257,7 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 %if %{with vtk}
 Requires:	%{name}-viz = %{epoch}:%{version}-%{release}
 %endif
-Obsoletes:	opencv-static
+Obsoletes:	opencv-static < 1:2
 
 %description devel
 Header files for OpenCV library.
@@ -270,7 +271,6 @@ Summary(fr.UTF-8):	Documentation pour OpenCV
 Summary(it.UTF-8):	Documentazione di OpenCV
 Summary(pl.UTF-8):	Podręcznik dla OpenCV
 Group:		Documentation
-# noarch subpackages only when building with rpm5
 BuildArch:	noarch
 
 %description doc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/6b377ff34240bf6a23e4c76e05c555a8e9c11d5a



More information about the pld-cvs-commit mailing list