From 9b91c3222c990272a9aabe112e9496e554a59fcc97f02ef6b71919474d3b8474 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 9 Dec 2022 13:47:22 +0000
Subject: [PATCH] Accepting request 1041882 from
 home:favogt:branches:KDE:Applications

- Use qmlimport dependencies for public org.kde.kalendar.*
- Drop requires on nonexisting -import subpackage
- Install the plasmoid with kalendar if plasma5-workspace is installed

OBS-URL: https://build.opensuse.org/request/show/1041882
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kalendar?expand=0&rev=31
---
 kalendar.changes | 7 +++++++
 kalendar.spec    | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/kalendar.changes b/kalendar.changes
index 4e10777..1c6b3dc 100644
--- a/kalendar.changes
+++ b/kalendar.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec  9 13:30:12 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Use qmlimport dependencies for public org.kde.kalendar.*
+- Drop requires on nonexisting -import subpackage
+- Install the plasmoid with kalendar if plasma5-workspace is installed
+
 -------------------------------------------------------------------
 Fri Dec  2 12:24:51 UTC 2022 - Christophe Marin <christophe@krop.fr>
 
diff --git a/kalendar.spec b/kalendar.spec
index 99a7979..928f397 100644
--- a/kalendar.spec
+++ b/kalendar.spec
@@ -16,7 +16,7 @@
 #
 
 
-%global __requires_exclude qmlimport\\((org\\.kde\\.kalendar|org\\.kde\\.raven).*
+%global __requires_exclude qmlimport\\((org\\.kde\\.kalendar\\.1|org\\.kde\\.raven).*
 %define kf5_version 5.96.0
 %bcond_without released
 Name:           kalendar
@@ -46,11 +46,11 @@ BuildRequires:  cmake(KF5IconThemes)
 BuildRequires:  cmake(KF5ItemModels)
 BuildRequires:  cmake(KF5Kirigami2)
 BuildRequires:  cmake(KF5MailCommon)
+BuildRequires:  cmake(KF5PimCommonAkonadi)
 BuildRequires:  cmake(KF5Plasma)
 BuildRequires:  cmake(KF5QQC2DesktopStyle)
 BuildRequires:  cmake(KF5WindowSystem)
 BuildRequires:  cmake(KF5XmlGui)
-BuildRequires:  cmake(KF5PimCommonAkonadi)
 BuildRequires:  cmake(Qt5Core) >= 5.15.2
 BuildRequires:  cmake(Qt5DBus)
 BuildRequires:  cmake(Qt5Gui)
@@ -75,10 +75,11 @@ ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 mips mips64
 
 %description
 Calendar application using Akonadi to sync with external services (NextCloud, GMail, ...).
+
 %package plasmoid
 Summary:        Plasma widget to view address book contacts
+Supplements:    (%{name} and plasma5-workspace)
 Requires:       %{name} = %{version}
-Requires:       %{name}-imports = %{version}
 
 %description plasmoid
 This package provides a Plasma widget to view address book contacts.