Add Provides/Obsoletes to replace plasma 5

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-desktop?expand=0&rev=9

plasma6-desktop.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  4 18:52:18 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Add Provides/Obsoletes to replace Plasma 5
+
 -------------------------------------------------------------------
 Thu Feb 29 12:54:32 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

plasma6-desktop.spec

@@ -43,11 +43,6 @@ Source2:        plasma.keyring
 %endif
 # PATCH-FIX-OPENSUSE
 Patch100:       0001-Apply-branding-to-default-favorites.patch
-# SECTION kaccounts
-# BuildRequires:  cmake(KAccounts) >= 20.04
-# # Needed by ^, fixed in TW only
-# BuildRequires:  intltool
-# /SECTION
 BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
 BuildRequires:  fdupes
 # Due to KWinDBusInterface not having a cmake version config file, we need to BR kwin6-devel instead
@@ -58,6 +53,7 @@ BuildRequires:  kscreenlocker6-devel >= %{_plasma6_bugfix}
 BuildRequires:  kwin6-devel >= %{_plasma6_bugfix}
 BuildRequires:  qt6-gui-private-devel >= %{qt6_version}
 BuildRequires:  update-desktop-files
+BuildRequires:  cmake(KAccounts6)
 BuildRequires:  cmake(KF6Attica) >= %{kf6_version}
 BuildRequires:  cmake(KF6Auth) >= %{kf6_version}
 BuildRequires:  cmake(KF6Baloo) >= %{kf6_version}
@@ -184,13 +180,14 @@ Conflicts:      kio-extras5 <= 5.3.2
 Provides:       kcm-touchpad5 = %{version}
 Obsoletes:      kcm-touchpad5 < %{version}
 Provides:       plasma6-desktop-branding = %{version}
-Provides:       plasma6-desktop-branding-upstream = %{version}
+Provides:       plasma5-desktop-branding-upstream = %{version}
-Obsoletes:      plasma6-desktop-branding-upstream < %{version}
+Obsoletes:      plasma5-desktop-branding-upstream < %{version}
-Provides:       plasma6-addons-kimpanel = %{version}
+Provides:       plasma5-desktop = %{version}
-Obsoletes:      plasma6-addons-kimpanel < %{version}
+Obsoletes:      plasma5-desktop < %{version}
-Provides:       plasma6-desktop-kimpanel = %{version}
+Provides:       plasma5-addons-kimpanel = %{version}
-Obsoletes:      plasma6-desktop-kimpanel < %{version}
+Obsoletes:      plasma5-addons-kimpanel < %{version}
-Conflicts:      plasma5-desktop
+Provides:       plasma5-desktop-kimpanel = %{version}
+Obsoletes:      plasma5-desktop-kimpanel < %{version}
 Requires:       (plasma6-kimpanel-ibus if ibus)
 Requires:       (plasma6-kimpanel-scim if scim)
 
@@ -206,7 +203,8 @@ Summary:        Selection window for emoji text input
 Requires:       plasma6-desktop = %{version}
 # Other color fonts don't really work that well
 Recommends:     noto-coloremoji-fonts
-Conflicts:      plasma5-desktop-emojier
+Provides:       plasma5-desktop-emojier = %{version}
+Obsoletes:      plasma5-desktop-emojier < %{version}
 
 %description emojier
 Press Meta+. to open an emoji selection window.
@@ -337,15 +335,14 @@ rm -rv %{buildroot}%{_kf6_sharedir}/dbus-1/interfaces/
 %{_kf6_sharedir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy
 %{_kf6_sharedir}/solid/
 %{_kf6_libexecdir}/kauth/kcmdatetimehelper
+%{_kf6_plugindir}/attica_kde.so
+%dir %{_kf6_sharedir}/accounts/
+%dir %{_kf6_sharedir}/accounts/providers
+%dir %{_kf6_sharedir}/accounts/services
+%{_kf6_sharedir}/accounts/providers/kde/
+%{_kf6_sharedir}/accounts/services/kde/
 %exclude %{_kf6_plasmadir}/emoji/
-# SECTION kaccounts
+
-# %%{_kf6_plugindir}/attica_kde.so
-# %%dir %%{_kf6_sharedir}/accounts/
-# %%dir %%{_kf6_sharedir}/accounts/providers
-# %%dir %%{_kf6_sharedir}/accounts/services
-# %%{_kf6_sharedir}/accounts/providers/kde/
-# %%{_kf6_sharedir}/accounts/services/kde/
-# /SECTION
 %ifnarch s390 s390x
 %{_kf6_applicationsdir}/kcm_mouse.desktop
 %{_kf6_applicationsdir}/kcm_touchpad.desktop