From 6a56dab1b29df4c52d8d156083b1d3abd52b66d0 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 13 Sep 2021 14:10:21 +0200 Subject: [PATCH] Obsoletes: qt6-qtquickcontrols2 --- qt6-qtdeclarative.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec index 1b8ad61..8fbc04b 100644 --- a/qt6-qtdeclarative.spec +++ b/qt6-qtdeclarative.spec @@ -15,7 +15,7 @@ ExcludeArch: s390x Summary: Qt6 - QtDeclarative component Name: qt6-%{qt_module} Version: 6.2.0%{?unstable:~%{prerelease}} -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -58,14 +58,19 @@ BuildRequires: time BuildRequires: xorg-x11-server-Xvfb %endif +Obsoletes: qt6-qtquickcontrols2 < 6.2.0~beta3-1 +Provides: qt6-qtquickcontrols2 = %{version}-%{release} + %description %{summary}. %package devel Summary: Development files for %{name} Provides: %{name}-private-devel = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt6-qtbase-devel%{?_isa} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Obsoletes: qt6-qtquickcontrols2-devel < 6.2.0~beta3-1 +Provides: qt6-qtquickcontrols2-devel = %{version}-%{release} %description devel %{summary}. @@ -77,7 +82,9 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %package examples Summary: Programming examples for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: qt6-qtquickcontrols2-examples < 6.2.0~beta3-1 +Provides: qt6-qtquickcontrols2-examples = %{version}-%{release} %description examples %{summary}. @@ -298,6 +305,9 @@ make check -k -C tests ||: %changelog +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- Obsoletes: qt6-qtquickcontrols2 + * Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 - 6.2.0 - beta4