From f1d70b2e8141524cd3c9b0f2684493ceba20b428 Mon Sep 17 00:00:00 2001 From: Shawn Dunn Date: Thu, 30 May 2024 21:56:16 +0000 Subject: [PATCH 1/2] - Removed Obsolets from spec file to avoid collision with plasma-branding-MicroOS OBS-URL: https://build.opensuse.org/package/show/devel:microos:kalpa/plasma-branding-Kalpa?expand=0&rev=13 --- plasma-branding-Kalpa.changes | 5 +++++ plasma-branding-Kalpa.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plasma-branding-Kalpa.changes b/plasma-branding-Kalpa.changes index 01149de..f75b0e5 100644 --- a/plasma-branding-Kalpa.changes +++ b/plasma-branding-Kalpa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 30 21:42:03 UTC 2024 - Gerardo Gomez Rodriguez + +- Removed Obsolets from spec file to avoid collision with plasma-branding-MicroOS + ------------------------------------------------------------------- Mon Apr 1 21:20:32 UTC 2024 - Shawn Dunn diff --git a/plasma-branding-Kalpa.spec b/plasma-branding-Kalpa.spec index 93085d2..230ac94 100644 --- a/plasma-branding-Kalpa.spec +++ b/plasma-branding-Kalpa.spec @@ -48,7 +48,8 @@ Requires: transactional-update Conflicts: gnome-branding-MicroOS Provides: plasma-branding = %{version} Provides: plasma-branding-MicroOS = %{version} -Obsoletes: plasma-branding-MicroOS < %{version} +# Do not obsolete plasma-branding-MicroOS just yet +# Obsoletes: plasma-branding-MicroOS BuildArch: noarch %description From a320f5245e52113c2ee4615c5b42913074aa3cb3 Mon Sep 17 00:00:00 2001 From: Shawn Dunn Date: Thu, 30 May 2024 22:22:55 +0000 Subject: [PATCH 2/2] - Added Conflicts: plasma-branding-MicroOS OBS-URL: https://build.opensuse.org/package/show/devel:microos:kalpa/plasma-branding-Kalpa?expand=0&rev=14 --- plasma-branding-Kalpa.changes | 5 +++++ plasma-branding-Kalpa.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/plasma-branding-Kalpa.changes b/plasma-branding-Kalpa.changes index f75b0e5..78091c7 100644 --- a/plasma-branding-Kalpa.changes +++ b/plasma-branding-Kalpa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 30 22:22:26 UTC 2024 - Shawn Dunn + +- Added Conflicts: plasma-branding-MicroOS + ------------------------------------------------------------------- Thu May 30 21:42:03 UTC 2024 - Gerardo Gomez Rodriguez diff --git a/plasma-branding-Kalpa.spec b/plasma-branding-Kalpa.spec index 230ac94..a2760a6 100644 --- a/plasma-branding-Kalpa.spec +++ b/plasma-branding-Kalpa.spec @@ -50,6 +50,7 @@ Provides: plasma-branding = %{version} Provides: plasma-branding-MicroOS = %{version} # Do not obsolete plasma-branding-MicroOS just yet # Obsoletes: plasma-branding-MicroOS +Conflicts: plasma-branding-MicroOS = %{version} BuildArch: noarch %description