[packages/sip6] - bcond to allow to coexist with sip 4.x (there are no file conflicts); PyQt* Obsoletes moved to pyt

qboosh qboosh at pld-linux.org
Wed Oct 2 21:54:40 CEST 2024


commit b9035d781916a9531cdab5ede9d18f60c4f69ed8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 2 21:50:54 2024 +0200

    - bcond to allow to coexist with sip 4.x (there are no file conflicts); PyQt* Obsoletes moved to python3-PyQt5.spec and python3-PyQt5-sip.spec

 sip6.spec | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/sip6.spec b/sip6.spec
index aceef60..1bfc347 100644
--- a/sip6.spec
+++ b/sip6.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with	obsolete_sip4	# whether to obsolete sip 4 (not a replacement)
+
 Summary:	SIP - Python/C++ Bindings Generator
 Summary(pl.UTF-8):	SIP - generator wiązań Python/C++
 Name:		sip6
@@ -15,15 +19,13 @@ BuildRequires:	rpmbuild(macros) >= 1.750
 %if %{_ver_lt "%{py3_ver}" "3.11"}
 Requires:	python3-tomli
 %endif
-Obsoletes:	python-sip < 6
-Obsoletes:	python-sip-devel < 6
-Obsoletes:	python-PyQt5-sip < 6
-Obsoletes:	python-PyQt5-sip-devel < 6
-Obsoletes:	python3-sip < 6
-Obsoletes:	python3-sip-devel < 6
-Obsoletes:	python3-PyQt5-sip < 6
-Obsoletes:	python3-PyQt5-sip-devel < 6
-Obsoletes:	sip < 6
+%if %{with obsolete_sip4}
+Obsoletes:	python-sip < 2:6
+Obsoletes:	python-sip-devel < 2:6
+Obsoletes:	python3-sip < 2:6
+Obsoletes:	python3-sip-devel < 2:6
+Obsoletes:	sip < 2:6
+%endif
 Obsoletes:	sip5 < 6
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sip6.git/commitdiff/b9035d781916a9531cdab5ede9d18f60c4f69ed8



More information about the pld-cvs-commit mailing list