From 34adb42f9ce1d8fc75400c92816bb3c2caa699dce026396bea01c26c9cfaf47f Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 5 Mar 2024 08:08:10 +0000 Subject: [PATCH] Add Provides/Obsoletes to replace plasma 5 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-workspace?expand=0&rev=3 --- plasma6-workspace.changes | 5 +++++ plasma6-workspace.spec | 38 ++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/plasma6-workspace.changes b/plasma6-workspace.changes index f243470..7e0657e 100644 --- a/plasma6-workspace.changes +++ b/plasma6-workspace.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 4 18:52:28 UTC 2024 - Christophe Marin + +- Add Provides/Obsoletes to replace Plasma 5 + ------------------------------------------------------------------- Wed Feb 21 18:36:39 UTC 2024 - Fabian Vogt diff --git a/plasma6-workspace.spec b/plasma6-workspace.spec index f0bac88..a0d59d5 100644 --- a/plasma6-workspace.spec +++ b/plasma6-workspace.spec @@ -58,7 +58,9 @@ BuildRequires: pkgconfig BuildRequires: qt6-gui-private-devel >= %{qt6_version} BuildRequires: qt6-waylandclient-private-devel >= %{qt6_version} BuildRequires: update-desktop-files +BuildRequires: cmake(AppStreamQt) >= 1.0 BuildRequires: cmake(Breeze) >= %{_plasma6_bugfix} +BuildRequires: cmake(KExiv2Qt6) BuildRequires: cmake(KF6Archive) >= %{kf6_version} BuildRequires: cmake(KF6Auth) >= %{kf6_version} BuildRequires: cmake(KF6Baloo) >= %{kf6_version} @@ -125,10 +127,6 @@ BuildRequires: cmake(Qt6WaylandClient) >= %{qt6_version} BuildRequires: cmake(Qt6WaylandCompositor) >= %{qt6_version} BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} BuildRequires: cmake(ScreenSaverDBusInterface) >= %{_plasma6_bugfix} -# SECTION TODO -# BuildRequires: cmake(AppStreamQt) >= 1.0 -# BuildRequires: cmake(KF6KExiv2) -# /SECTION BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-uc) @@ -211,16 +209,20 @@ Recommends: (appmenu-gtk2-module if libgtk-2_0-0) Recommends: (appmenu-gtk3-module if libgtk-3-0) # plasma6-desktop 'Provides' kdebase4-workspace < 5.3.0 Conflicts: kdebase4-workspace < 5.3.0 -Conflicts: plasma5-workspace +Provides: plasma5-workspace = %{version} +Obsoletes: plasma5-workspace < %{version} # Use to be a separate package in plasma5 -Conflicts: gmenudbusmenuproxy +Provides: gmenudbusmenuproxy = %{version} +Obsoletes: gmenudbusmenuproxy < %{version} # If installed, it force-enables itself which can cause issues # gmenudbusmenuproxy used to conflict with this package Conflicts: unity-gtk-module-common # Use to be a separate package in plasma5 -Conflicts: xembedsniproxy +Provides: xembedsniproxy = %{version} +Obsoletes: xembedsniproxy < %{version} # Used to be provided/obsoleted by xembedsniproxy -Conflicts: xembed-sni-proxy +Provides: xembed-sni-proxy = %{version} +Obsoletes: xembed-sni-proxy < %{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} @@ -232,7 +234,8 @@ Provides: qt6qmlimport(org.kde.plasma.shell.2) = 0 Provides: qt6qmlimport(org.kde.plasma.shell.panel) Provides: qt6qmlimport(org.kde.plasma.shell.panel.0) = 1 # Was dropped in 5.20, replaced by kcm_users from p-d -Conflicts: kde-user-manager +Provides: kde-user-manager = %{version} +Obsoletes: kde-user-manager < %{version} %description This package contains the basic packages for a Plasma workspace. @@ -240,7 +243,8 @@ This package contains the basic packages for a Plasma workspace. %package libs Summary: The KDE Plasma Workspace Components %requires_ge plasma6-framework -Conflicts: plasma5-workspace-libs +Provides: plasma5-workspace-libs = %{version} +Obsoletes: plasma5-workspace-libs < %{version} %description libs This package contains the basic packages for a KDE Plasma 6 workspace. @@ -256,7 +260,8 @@ Requires: cmake(Qt6Gui) >= %{qt6_version} Requires: cmake(Qt6Quick) >= %{qt6_version} Conflicts: kapptemplate <= 16.03.80 Conflicts: kdebase4-workspace-devel -Conflicts: plasma5-workspace-devel +Provides: plasma5-workspace-devel = %{version} +Obsoletes: plasma5-workspace-devel < %{version} %description devel This package contains the basic packages for a KDE Plasma 6 workspace. @@ -277,9 +282,12 @@ Requires: qt6-wayland Requires: pipewire Requires: xdg-user-dirs Requires: xorg-x11-server-wayland -Conflicts: kdebase4-session -Conflicts: plasma5-session -Conflicts: plasma5-session-wayland +Provides: kdebase4-session = %{version} +Obsoletes: kdebase4-session < %{version} +Provides: plasma5-session = %{version} +Obsoletes: plasma5-session < %{version} +Provides: plasma5-session-wayland = %{version} +Obsoletes: plasma5-session-wayland < %{version} # People may want the X11 session Recommends: plasma6-session-x11 = %{version} BuildArch: noarch @@ -290,8 +298,6 @@ Plasma 6 session. %package -n plasma6-session-x11 Summary: KDE Plasma 6 Session on X11 -Conflicts: kdebase4-session -Conflicts: plasma5-session Requires: xf86-input-libinput Requires: xorg-x11-server Requires: kwin6-x11 >= %{_plasma6_bugfix}