From 9b5cc4e6bef52e0547f7931b23a5e2b30727d7cc73d67d90f4218aeac2df7b01 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 5 Mar 2024 12:37:58 +0000 Subject: [PATCH] More obsoletions + kirigami-addons 1.0.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-workspace?expand=0&rev=4 --- plasma6-workspace.changes | 5 +++++ plasma6-workspace.spec | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/plasma6-workspace.changes b/plasma6-workspace.changes index 7e0657e..2c6d3e5 100644 --- a/plasma6-workspace.changes +++ b/plasma6-workspace.changes @@ -3,6 +3,11 @@ Mon Mar 4 18:52:28 UTC 2024 - Christophe Marin - Add Provides/Obsoletes to replace Plasma 5 +------------------------------------------------------------------- +Mon Mar 4 17:35:10 UTC 2024 - Fabian Vogt + +- Pull in kwayland-integration6 when necessary + ------------------------------------------------------------------- Wed Feb 21 18:36:39 UTC 2024 - Fabian Vogt diff --git a/plasma6-workspace.spec b/plasma6-workspace.spec index a0d59d5..7ac414e 100644 --- a/plasma6-workspace.spec +++ b/plasma6-workspace.spec @@ -198,8 +198,8 @@ Requires: %{_bindir}/grep # Qt6 SDDM greeter Requires: (sddm-greeter-qt6 if sddm) # For wallpaper thumbnails -# Enable once available, should be kio-extras6 -#Requires: kio-extras +# Not to be mistaken for kio-extras5 +Requires: kio-extras # Hardcode versions of plasma6-framework-components, as upstream doesn't keep backwards compability there %requires_ge plasma6-framework-components # The lockscreen has a button to open a virtual keyboard @@ -211,6 +211,7 @@ Recommends: (appmenu-gtk3-module if libgtk-3-0) Conflicts: kdebase4-workspace < 5.3.0 Provides: plasma5-workspace = %{version} Obsoletes: plasma5-workspace < %{version} +Obsoletes: plasma5-workspace-lang < %{version} # Use to be a separate package in plasma5 Provides: gmenudbusmenuproxy = %{version} Obsoletes: gmenudbusmenuproxy < %{version} @@ -223,6 +224,11 @@ Obsoletes: xembedsniproxy < %{version} # Used to be provided/obsoleted by xembedsniproxy Provides: xembed-sni-proxy = %{version} Obsoletes: xembed-sni-proxy < %{version} +# Dropped functionality +Obsoletes: khotkeys5 < %{version} +Obsoletes: khotkeys5-lang < %{version} +Obsoletes: ksysguard5 < %{version} +Obsoletes: ksysguard5-lang < %{version} # Some files have been moved from kio-extras5 to plasma5-workspace in 5.4. This should prevent a possible file conflict. (boo#944656) Conflicts: kio-extras5 < 15.08.0 Provides: plasma6-workspace-branding = %{_plasma6_bugfix} @@ -242,9 +248,9 @@ This package contains the basic packages for a Plasma workspace. %package libs Summary: The KDE Plasma Workspace Components -%requires_ge plasma6-framework -Provides: plasma5-workspace-libs = %{version} -Obsoletes: plasma5-workspace-libs < %{version} +%requires_ge plasma6-framework +Provides: plasma5-workspace-libs = %{version} +Obsoletes: plasma5-workspace-libs < %{version} %description libs This package contains the basic packages for a KDE Plasma 6 workspace. @@ -259,7 +265,6 @@ Requires: cmake(Qt6Core) >= %{qt6_version} Requires: cmake(Qt6Gui) >= %{qt6_version} Requires: cmake(Qt6Quick) >= %{qt6_version} Conflicts: kapptemplate <= 16.03.80 -Conflicts: kdebase4-workspace-devel Provides: plasma5-workspace-devel = %{version} Obsoletes: plasma5-workspace-devel < %{version} @@ -277,6 +282,8 @@ Requires: polkit-kde-agent-6 >= %{_plasma6_bugfix} Requires: powerdevil6 >= %{_plasma6_bugfix} Requires: systemsettings6 >= %{_plasma6_bugfix} Requires: kf6-kwindowsystem >= %{kf6_version} +# For KF5 kwayland (!) +Requires: (kwayland-integration6 if kwayland) Requires: qt6-wayland # For screen sharing and window thumbnails in plasmashell Requires: pipewire