From a1749a144fb79925879349da1e78e189e96b2d63334ed24d88575cb404549080 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 5 Mar 2024 12:37:50 +0000 Subject: [PATCH] More obsoletions + kirigami-addons 1.0.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kscreen6?expand=0&rev=3 --- kscreen6.changes | 5 +++++ kscreen6.spec | 18 +++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/kscreen6.changes b/kscreen6.changes index 0e69667..731bfc1 100644 --- a/kscreen6.changes +++ b/kscreen6.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 5 08:43:30 UTC 2024 - Fabian Vogt + +- Merge kscreen6-plasmoid into kscreen6 + ------------------------------------------------------------------- Wed Feb 21 18:36:13 UTC 2024 - Fabian Vogt diff --git a/kscreen6.spec b/kscreen6.spec index 2ea9591..35f8fdc 100644 --- a/kscreen6.spec +++ b/kscreen6.spec @@ -61,21 +61,16 @@ BuildRequires: pkgconfig(xi) Requires: kf6-kded Requires: libkscreen6-plugin >= %{_plasma6_bugfix} Requires: xrdb -Recommends: kscreen6-plasmoid Supplements: (libkscreen6-plugin and plasma6-workspace) -Conflicts: kscreen5 -Conflicts: kscreen5-lang +Obsoletes: kscreen5 < %{version} +Obsoletes: kscreen5-lang < %{version} +Obsoletes: kscreen5-plasmoid < %{version} +Provides: kscreen6-plasmoid < %{version} +Obsoletes: kscreen6-plasmoid < %{version} %description KScreen handles screen management for both X11 and Wayland sessions, including rotation, size, refresh rate, and scaling. -%package plasmoid -Summary: Plasma widget to control screen configuration -Requires: kscreen6 = %{version} - -%description plasmoid -This package provides a Plasma widget to control common screen configuration options. - %lang_package %prep @@ -114,9 +109,6 @@ This package provides a Plasma widget to control common screen configuration opt %{_userunitdir}/plasma-kscreen-osd.service %dir %{_kf6_sharedir}/kglobalaccel/ %{_kf6_sharedir}/kglobalaccel/org.kde.kscreen.desktop - -%files plasmoid -%license LICENSES/* %{_kf6_plasmadir}/plasmoids/org.kde.kscreen/ %files lang -f kscreen6.lang