OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kalendar?expand=0&rev=18

kalendar.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 19 08:11:03 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Merge -imports and the main kalendar package.
+
 -------------------------------------------------------------------
 Sun Aug 14 09:41:53 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 

kalendar.spec

@@ -63,18 +63,12 @@ Requires:       qt5qmlimport(QtQuick.Dialogs.1)
 Requires:       qt5qmlimport(org.kde.kitemmodels.1)
 # Got vendored for now
 #Requires:       qt5qmlimport(org.kde.kirigamiaddons.treeview.1)
+# it only briefly existed in the devel project, no need for Provides/Obsoletes
+Conflicts:      kalendar-imports
 
 %description
 Calendar application using Akonadi to sync with external services (NextCloud, GMail, ...).
 
-%package imports
-Summary:       QtQuick bindings for kalendar, a calendar application
-Requires:      %{name} = %{version}
-
-%description imports
-Calendar application using Akonadi to sync with external services (NextCloud, GMail, ...). 
-This package provides QtQuick bindings to allow use of kalendar in other QtQuick applications.
-
 %lang_package
 
 %prep
@@ -92,18 +86,16 @@ This package provides QtQuick bindings to allow use of kalendar in other QtQuick
 
 %files
 %license LICENSES/*
+%dir %{_kf5_qmldir}/org/kde/kalendar/
 %{_kf5_applicationsdir}/org.kde.kalendar.desktop
 %{_kf5_appstreamdir}/org.kde.kalendar.appdata.xml
 %{_kf5_bindir}/kalendar
+%{_kf5_debugdir}/akonadi.quick.categories
 %{_kf5_debugdir}/kalendar.categories
 %{_kf5_debugdir}/kalendar.contact.categories
 %{_kf5_iconsdir}/hicolor/scalable/apps/org.kde.kalendar.svg
-
-%files imports
-%dir %{_kf5_qmldir}/org/kde/kalendar/
-%{_kf5_qmldir}/org/kde/kalendar/contact/
 %{_kf5_qmldir}/org/kde/akonadi/
-%{_kf5_debugdir}/akonadi.quick.categories
+%{_kf5_qmldir}/org/kde/kalendar/contact/
 
 %if %{with released}
 %files lang -f %{name}.lang