From 75741f621edd29eae27be79003e249329e2bf350bba1c2500b9377963b4cdcc4 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 5 Mar 2024 12:37:55 +0000 Subject: [PATCH] More obsoletions + kirigami-addons 1.0.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-integration?expand=0&rev=3 --- plasma6-integration.changes | 5 +++++ plasma6-integration.spec | 13 +++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/plasma6-integration.changes b/plasma6-integration.changes index 3dcef82..c8f3e08 100644 --- a/plasma6-integration.changes +++ b/plasma6-integration.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 5 10:50:07 UTC 2024 - Fabian Vogt + +- Obsolete plasma5-integration + ------------------------------------------------------------------- Wed Feb 21 18:36:37 UTC 2024 - Fabian Vogt diff --git a/plasma6-integration.spec b/plasma6-integration.spec index ff406df..7a61932 100644 --- a/plasma6-integration.spec +++ b/plasma6-integration.spec @@ -104,16 +104,9 @@ Requires: xdg-desktop-portal-kde6 # Forced on all QGuiApplications Requires: qqc2-breeze-style6 %requires_eq libQt6Gui6 -%if %{with plasma5} -# TODO The package can't provide/obsolete plasma5 one or plasma5-{nano,desktop,openSUSE} can't be built -# Provides: plasma5-integration-plugin = %%{version} -# Obsoletes: plasma5-integration-plugin = %%{version} -%else -# Conflicts: plasma5-integration-plugin -%endif -Conflicts: plasma5-integration-plugin -# FIXME conflicting catalog names upstream -Conflicts: plasma5-integration-plugin-lang +Provides: plasma5-integration-plugin < %{version} +Obsoletes: plasma5-integration-plugin < %{version} +Obsoletes: plasma5-integration-plugin-lang < %{version} %description plugin Plasma Integration is a set of plugins responsible for better integration of Qt