From 6acb7ea10ff3106e9990db9c1dd1f7fd45f09d46 Mon Sep 17 00:00:00 2001 From: Anders da Silva Rytter Hansen Date: Thu, 28 May 2026 18:17:45 -0300 Subject: [PATCH] fix dependency hell --- from-callmetango/kwin/kwin.spec | 4 ++-- from-callmetango/plasma-desktop/plasma-desktop.spec | 3 ++- from-callmetango/plasma-workspace/plasma-workspace.spec | 7 +++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/from-callmetango/kwin/kwin.spec b/from-callmetango/kwin/kwin.spec index 6499f7a..8d524ce 100644 --- a/from-callmetango/kwin/kwin.spec +++ b/from-callmetango/kwin/kwin.spec @@ -4,7 +4,7 @@ Name: sonic-win Version: 6.6.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: KDE Window manager License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT @@ -134,7 +134,7 @@ Obsoletes: kwin-gles < 5 Obsoletes: kwin-gles-libs < 5 # Split of X11 variant into subpackage -Obsoletes: kwin < 5.19.5-3 +Obsoletes: kwin < %{version}-%{release} #Requires: kwin-wayland = %{version}-%{release} diff --git a/from-callmetango/plasma-desktop/plasma-desktop.spec b/from-callmetango/plasma-desktop/plasma-desktop.spec index 7cc91fa..90bf202 100644 --- a/from-callmetango/plasma-desktop/plasma-desktop.spec +++ b/from-callmetango/plasma-desktop/plasma-desktop.spec @@ -11,7 +11,7 @@ Name: sonic-desktop-interface Summary: Plasma Desktop shell Version: 6.6.4 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) #URL: https://invent.kde.org/plasma/%{name} @@ -212,6 +212,7 @@ Conflicts: kde-l10n < 15.12.3-4 Conflicts: kde-settings < 39.1-7 Conflicts: plasma-desktop +Obsoletes: plasma-desktop < %{version}-%{release} %description %{summary}. diff --git a/from-callmetango/plasma-workspace/plasma-workspace.spec b/from-callmetango/plasma-workspace/plasma-workspace.spec index c682c2a..b336cce 100644 --- a/from-callmetango/plasma-workspace/plasma-workspace.spec +++ b/from-callmetango/plasma-workspace/plasma-workspace.spec @@ -7,7 +7,7 @@ Name: sonic-workspace Summary: Plasma workspace, applications and applets Version: 6.6.4 -Release: 10%{?dist} +Release: 11%{?dist} # Automatically converted from old format: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT - review is highly recommended. License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT @@ -285,7 +285,7 @@ BuildRequires: pkgconfig(iso-codes) Requires: iso-codes # Split of Xorg session into subpackage -Obsoletes: plasma-workspace < 5.19.5-2 +Obsoletes: plasma-workspace <= %{plasma_version} # khotkeys was dropped Obsoletes: khotkeys < 6 @@ -303,6 +303,7 @@ Recommends: xwaylandvideobridge Obsoletes: %{oldname}-wayland < 6.4.1-2 Conflicts: %{oldname}-wayland < 6.4.1-2 Conflicts: plasma-workspace-x11 +Conflicts: plasma-workspace Provides: sonic-workspace = %{version}-%{release} Provides: sonic-workspace%{?_isa} = %{version}-%{release} @@ -335,6 +336,8 @@ Requires: %{name}-common = %{version}-%{release} # consider splitting out plasma_packagestructure content later Provides: plasma-packagestructure = %{version}-%{release} Conflicts: plasma-workspace-x11-libs +Conflicts: plasma-workspace-libs +Obsoletes: plasma-workspace-libs < %{version}-%{release} %description libs %{summary}.