commit kjots for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2023-04-23 22:47:25
Comparing /work/SRC/openSUSE:Factory/kjots (Old)
and /work/SRC/openSUSE:Factory/.kjots.new.1533 (New)
Package is "kjots"
Sun Apr 23 22:47:25 2023 rev:14 rq:1080953 version:5.1.1
Changes:
--- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2022-08-12
16:07:14.419577655 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new.1533/kjots.changes2023-04-23
22:50:38.267787559 +0200
@@ -1,0 +2,20 @@
+Thu Apr 20 18:18:59 UTC 2023 - Christophe Marin
+
+- Update to 5.1.1. No changelog
+- Drop patches, merged upstream:
+ * noteshared-add-missing-library-to-link-list.patch
+ * Adapt-to-new-Akonadi-libraries.patch
+ * Fix-akonadi-includes.patch
+ * Fix-build-with-Akonadi-21.12.patch
+ * 0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
+ * port-to-new-KPIMTextEditTextToSpeech-split-library-location.patch
+ * Make-compile-against-ktextaddons.patch
+
+---
+Wed Apr 5 07:26:59 UTC 2023 - Wolfgang Bauer
+
+- Add upstream patches to fix build with Akonadi 23.04:
+ * port-to-new-KPIMTextEditTextToSpeech-split-library-location.patch
+ * Make-compile-against-ktextaddons.patch
+
+---
Old:
0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
Adapt-to-new-Akonadi-libraries.patch
Fix-akonadi-includes.patch
Fix-build-with-Akonadi-21.12.patch
kjots-5.1.0.tar.xz
noteshared-add-missing-library-to-link-list.patch
New:
kjots-5.1.1.tar.xz
kjots-5.1.1.tar.xz.sig
kjots.keyring
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.MvcGvt/_old 2023-04-23 22:50:38.767790384 +0200
+++ /var/tmp/diff_new_pack.MvcGvt/_new 2023-04-23 22:50:38.771790407 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kjots
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,38 +16,34 @@
#
+%bcond_without released
Name: kjots
-Version:5.1.0
+Version:5.1.1
Release:0
Summary:A note taking application using Akonadi
-License:GPL-2.0-only AND LGPL-2.1-or-later
-Group: System/GUI/KDE
+License:GPL-2.0-or-later
URL:https://userbase.kde.org/KJots/
Source0:
https://download.kde.org/stable/kjots/%{version}/src/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM
-Patch0: noteshared-add-missing-library-to-link-list.patch
-Patch1: Adapt-to-new-Akonadi-libraries.patch
-# PATCH-FIX-UPSTREAM
-Patch2: Fix-akonadi-includes.patch
-Patch3: Fix-build-with-Akonadi-21.12.patch
-Patch4: 0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
+%if %{with released}
+Source1:
https://download.kde.org/stable/kjots/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:kjots.keyring
+%endif
BuildRequires: extra-cmake-modules
BuildRequires: update-desktop-files
BuildRequires: cmake(Grantlee5)
-BuildRequires: cmake(KF5Akonadi)
-BuildRequires: cmake(KF5AkonadiNotes)
BuildRequires: cmake(KF5Bookmarks)
BuildRequires: cmake(KF5Config)
-BuildRequires: cmake(KF5ConfigWidgets)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5KCMUtils)
BuildRequires: cmake(KF5KIO)
-BuildRequires: cmake(KF5KontactInterface)
-BuildRequires: cmake(KF5Libkdepim)
-BuildRequires: cmake(KF5Mime)
BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KF5PimTextEdit)
+BuildRequires: cmake(KF5TextEditTextToSpeech)
BuildRequires: cmake(KF5XmlGui)
+BuildRequires: cmake(KPim5Akonadi)
+BuildRequires: cmake(KPim5AkonadiNotes)
+BuildRequires: cmake(KPim5KontactInterface)
+BuildRequires: cmake(KPim5Mime)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5PrintSupport)
@@ -66,30 +62,29 @@
%install
%kf5_makeinstall -C build
+
%suse_update_desktop_file -C "Note Taker" org.kde.kjotsUtility
DesktopUtility
+
%find_lang %{name}
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
-%license COPYING COPYING.LIB
-%doc ANNOUNCE CHANGES README
-%{_kf5_appstreamdir}/
+%license LICENSES/*
+%dir %{_kf5_plugindir}/pim5
+%dir %{_kf5_plugindir}/pim5/kontact
%{_kf5_applicationsdir}/org.kde.kjots.desktop
+%{_kf5_appstreamdir}/org.kde.kjots.appdata.xml
%{_kf5_bindir}/kjots
%{_kf5_configkcfgdir}/kjots.kcfg
+%{_kf5_iconsdir}/hicolor/*/apps/kjots.*
%{_kf5_kxmlguidir}/kjots/
-%{_kf5_servicesdir}/kjotspart.desktop
-%{_kf5_plugindir}/kjotspart.so
commit kjots for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2022-08-12 16:06:44
Comparing /work/SRC/openSUSE:Factory/kjots (Old)
and /work/SRC/openSUSE:Factory/.kjots.new.1521 (New)
Package is "kjots"
Fri Aug 12 16:06:44 2022 rev:13 rq:994688 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2022-04-01
21:37:32.268554815 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new.1521/kjots.changes2022-08-12
16:07:14.419577655 +0200
@@ -1,0 +2,6 @@
+Fri Aug 12 06:15:50 UTC 2022 - Christophe Giboudeaux
+
+- Add patch to fix build with recent kontactinterface releases:
+ * 0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
+
+---
New:
0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.TC0Otg/_old 2022-08-12 16:07:14.895579087 +0200
+++ /var/tmp/diff_new_pack.TC0Otg/_new 2022-08-12 16:07:14.903579110 +0200
@@ -30,6 +30,7 @@
# PATCH-FIX-UPSTREAM
Patch2: Fix-akonadi-includes.patch
Patch3: Fix-build-with-Akonadi-21.12.patch
+Patch4: 0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch
BuildRequires: extra-cmake-modules
BuildRequires: update-desktop-files
BuildRequires: cmake(Grantlee5)
++ 0001-Adapt-to-new-KontactInterface-Plugin-ctor.patch ++
>From 85121754c862417e872048ae2f85e9b9fe2ddc7a Mon Sep 17 00:00:00 2001
From: Nicolas Fella
Date: Thu, 14 Jul 2022 14:27:55 +0200
Subject: [PATCH] Adapt to new KontactInterface::Plugin ctor
---
src/kontact_plugin/kjots_plugin.cpp | 5 +
src/kontact_plugin/kjots_plugin.h | 4
2 files changed, 9 insertions(+)
diff --git a/src/kontact_plugin/kjots_plugin.cpp
b/src/kontact_plugin/kjots_plugin.cpp
index 68db22b..9907d2b 100644
--- a/src/kontact_plugin/kjots_plugin.cpp
+++ b/src/kontact_plugin/kjots_plugin.cpp
@@ -56,8 +56,13 @@
EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json")
+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41)
+KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData
, const QVariantList &/*args*/)
+: KontactInterface::Plugin(core, core, md, "kjots")
+#else
KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList
&/*args*/)
: KontactInterface::Plugin(core, core, "kjots")
+#endif
{
setComponentName(QStringLiteral("kjots"), i18n("KJots"));
diff --git a/src/kontact_plugin/kjots_plugin.h
b/src/kontact_plugin/kjots_plugin.h
index ca06d65..ae7b69f 100644
--- a/src/kontact_plugin/kjots_plugin.h
+++ b/src/kontact_plugin/kjots_plugin.h
@@ -50,7 +50,11 @@ class KJotsPlugin : public KontactInterface::Plugin
Q_OBJECT
public:
+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 20, 41)
+KJotsPlugin(KontactInterface::Core *core, const KPluginMetaData , const
QVariantList &);
+#else
KJotsPlugin(KontactInterface::Core *core, const QVariantList &);
+#endif
int weight() const Q_DECL_OVERRIDE
{
commit kjots for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2022-04-01 21:36:13
Comparing /work/SRC/openSUSE:Factory/kjots (Old)
and /work/SRC/openSUSE:Factory/.kjots.new.1900 (New)
Package is "kjots"
Fri Apr 1 21:36:13 2022 rev:12 rq:966393 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2022-01-08
23:24:35.286279097 +0100
+++ /work/SRC/openSUSE:Factory/.kjots.new.1900/kjots.changes2022-04-01
21:37:32.268554815 +0200
@@ -1,0 +2,8 @@
+Fri Apr 1 10:30:50 UTC 2022 - Wolfgang Bauer
+
+- Add upstream patches to fix build with Akonadi 22.04:
+ * Fix-akonadi-includes.patch
+ * Fix-build-with-Akonadi-21.12.patch
+- Drop redundant recommendation of the -lang package
+
+---
New:
Fix-akonadi-includes.patch
Fix-build-with-Akonadi-21.12.patch
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.DTTUmF/_old 2022-04-01 21:37:32.668550428 +0200
+++ /var/tmp/diff_new_pack.DTTUmF/_new 2022-04-01 21:37:32.676550340 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kjots
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,9 @@
# PATCH-FIX-UPSTREAM
Patch0: noteshared-add-missing-library-to-link-list.patch
Patch1: Adapt-to-new-Akonadi-libraries.patch
+# PATCH-FIX-UPSTREAM
+Patch2: Fix-akonadi-includes.patch
+Patch3: Fix-build-with-Akonadi-21.12.patch
BuildRequires: extra-cmake-modules
BuildRequires: update-desktop-files
BuildRequires: cmake(Grantlee5)
@@ -46,7 +49,6 @@
BuildRequires: cmake(KF5XmlGui)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5PrintSupport)
-Recommends: %{name}-lang = %{version}
%description
This package contains KJOTS, a note taking application using Akonadi.
++ Fix-akonadi-includes.patch ++
>From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001
From: Nicolas Fella
Date: Tue, 1 Mar 2022 23:33:19 +0100
Subject: [PATCH] Fix akonadi includes
---
src/kjotsmodel.cpp | 2 +-
src/kjotswidget.cpp | 2 +-
src/noteshared/notecreatorandselector.cpp| 2 +-
src/noteshared/standardnoteactionmanager.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
index 99ee14f..48997a4 100644
--- a/src/kjotsmodel.cpp
+++ b/src/kjotsmodel.cpp
@@ -21,7 +21,7 @@
#include
#include
#endif
-#include
+#include
#include
#include
diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
index 834fc33..bb4d018 100644
--- a/src/kjotswidget.cpp
+++ b/src/kjotswidget.cpp
@@ -34,7 +34,7 @@
#include
// Akonadi
-#include
+#include
#include
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include
diff --git a/src/noteshared/notecreatorandselector.cpp
b/src/noteshared/notecreatorandselector.cpp
index 6d58c83..7518deb 100644
--- a/src/noteshared/notecreatorandselector.cpp
+++ b/src/noteshared/notecreatorandselector.cpp
@@ -24,7 +24,7 @@
#include
#include
#endif
-#include
+#include
#include "noteshared_debug.h"
diff --git a/src/noteshared/standardnoteactionmanager.cpp
b/src/noteshared/standardnoteactionmanager.cpp
index 2a2f4ce..692b8a2 100644
--- a/src/noteshared/standardnoteactionmanager.cpp
+++ b/src/noteshared/standardnoteactionmanager.cpp
@@ -25,7 +25,7 @@
#include
#include
#endif
-#include
+#include
#include
#include
--
GitLab
++ Fix-build-with-Akonadi-21.12.patch ++
>From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer
Date: Fri, 1 Apr 2022 08:00:34 +
Subject: [PATCH] Fix build with Akonadi 21.12
---
src/kjotsmodel.cpp | 4
src/kjotswidget.cpp | 6 +-
src/noteshared/notecreatorandselector.cpp| 4
src/noteshared/standardnoteactionmanager.cpp | 4
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
index 48997a4..66f791a 100644
--- a/src/kjotsmodel.cpp
+++ b/src/kjotsmodel.cpp
@@ -21,7 +21,11 @@
#include
#include
#endif
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41)
#include
+#else
+#include
+#endif
#include
#include
diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
index bb4d018..0332766 100644
--- a/src/kjotswidget.cpp
+++ b/src/kjotswidget.cpp
@@ -34,8 +34,12 @@
#include
// Akonadi
-#include
#include
+#if AKONADI_VERSION >=
commit kjots for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2022-01-08 23:23:53
Comparing /work/SRC/openSUSE:Factory/kjots (Old)
and /work/SRC/openSUSE:Factory/.kjots.new.1892 (New)
Package is "kjots"
Sat Jan 8 23:23:53 2022 rev:11 rq:944836 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2021-06-29
22:43:54.030924382 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new.1892/kjots.changes2022-01-08
23:24:35.286279097 +0100
@@ -1,0 +2,7 @@
+Tue Nov 30 14:53:36 UTC 2021 - Wolfgang Bauer
+
+- Add upstream patches to fix build with Akonadi 21.12:
+ * noteshared-add-missing-library-to-link-list.patch
+ * Adapt-to-new-Akonadi-libraries.patch
+
+---
New:
Adapt-to-new-Akonadi-libraries.patch
noteshared-add-missing-library-to-link-list.patch
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.fZ8APL/_old 2022-01-08 23:24:35.798279516 +0100
+++ /var/tmp/diff_new_pack.fZ8APL/_new 2022-01-08 23:24:35.802279519 +0100
@@ -24,6 +24,9 @@
Group: System/GUI/KDE
URL:https://userbase.kde.org/KJots/
Source0:
https://download.kde.org/stable/kjots/%{version}/src/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch0: noteshared-add-missing-library-to-link-list.patch
+Patch1: Adapt-to-new-Akonadi-libraries.patch
BuildRequires: extra-cmake-modules
BuildRequires: update-desktop-files
BuildRequires: cmake(Grantlee5)
@@ -51,7 +54,7 @@
%lang_package
%prep
-%setup -q
+%autosetup -p1
%build
%cmake_kf5 -d build
++ Adapt-to-new-Akonadi-libraries.patch ++
>From 581548a1de9449efc0c77e9ac85c23066bac983e Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau"
Date: Wed, 8 Sep 2021 00:58:25 +0200
Subject: [PATCH] Adapt to new Akonadi libraries includes using the C++
namespace as prefix
GIT_SILENT
---
src/kjotsedit.cpp| 5 +
src/kjotsmodel.cpp | 6 ++
src/kjotsmodel.h | 6 ++
src/kjotswidget.cpp | 20 +++-
src/kjotswidget.h| 5 +
src/noteshared/notecreatorandselector.cpp| 7 +++
src/noteshared/notecreatorandselector.h | 6 ++
src/noteshared/notelockattribute.h | 6 ++
src/noteshared/notepinattribute.h| 6 ++
src/noteshared/standardnoteactionmanager.cpp | 8
src/noteshared/standardnoteactionmanager.h | 9 +++--
src/notesortproxymodel.cpp | 5 +
12 files changed, 86 insertions(+), 3 deletions(-)
diff --git a/src/kjotsedit.cpp b/src/kjotsedit.cpp
index f1d61bd..c20bc42 100644
--- a/src/kjotsedit.cpp
+++ b/src/kjotsedit.cpp
@@ -33,7 +33,12 @@
#include
#include
+#include
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include
+#else
#include
+#endif
#include "kjotslinkdialog.h"
#include "kjotsmodel.h"
diff --git a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp
index e35c94f..99ee14f 100644
--- a/src/kjotsmodel.cpp
+++ b/src/kjotsmodel.cpp
@@ -13,8 +13,14 @@
#include
#include
+#include
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include
+#include
+#else
#include
#include
+#endif
#include
#include
diff --git a/src/kjotsmodel.h b/src/kjotsmodel.h
index 71e0ca6..ec564a7 100644
--- a/src/kjotsmodel.h
+++ b/src/kjotsmodel.h
@@ -10,7 +10,13 @@
#ifndef KJOTSMODEL_H
#define KJOTSMODEL_H
+#include
+#include // for QT_VERSION_CHECK
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include
+#else
#include
+#endif
class QTextDocument;
diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
index 3a3abd0..834fc33 100644
--- a/src/kjotswidget.cpp
+++ b/src/kjotswidget.cpp
@@ -35,6 +35,24 @@
// Akonadi
#include
+#include
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#else
#include
#include
#include
@@ -50,7 +68,7 @@
#include
#include
#include
-
+#endif
// Grantlee
#include
#include
diff --git a/src/kjotswidget.h b/src/kjotswidget.h
index 7fe91ed..00a41b5 100644
--- a/src/kjotswidget.h
+++ b/src/kjotswidget.h
@@ -18,7 +18,12 @@
#include
#include
+#include
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include
+#else
#include
+#endif
#include
diff --git a/src/noteshared/notecreatorandselector.cpp
b/src/noteshared/notecreatorandselector.cpp
index 2172cbf..6d58c83 100644
---
commit kjots for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2021-06-29 22:43:17
Comparing /work/SRC/openSUSE:Factory/kjots (Old)
and /work/SRC/openSUSE:Factory/.kjots.new.2625 (New)
Package is "kjots"
Tue Jun 29 22:43:17 2021 rev:10 rq:902932 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2020-08-18
13:59:26.310221284 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new.2625/kjots.changes2021-06-29
22:43:54.030924382 +0200
@@ -1,0 +2,13 @@
+Tue Jun 29 05:46:43 UTC 2021 - Wolfgang Bauer
+
+- Update to version 5.1.0:
+ * No changelog available
+- Drop patches merged upstream:
+ * Fix-bookmarks-actions.patch
+ * Install-the-kontact-plugin-into-kontact5.patch
+- Update build requirements
+- Run spec-cleaner
+- Update URL
+- Remove "for KDE" from package summary and description
+
+---
Old:
Fix-bookmarks-actions.patch
Install-the-kontact-plugin-into-kontact5.patch
kjots-5.0.2.tar.xz
New:
kjots-5.1.0.tar.xz
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.FY4maP/_old 2021-06-29 22:43:54.438924921 +0200
+++ /var/tmp/diff_new_pack.FY4maP/_new 2021-06-29 22:43:54.438924921 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kjots
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,47 +17,41 @@
Name: kjots
-Version:5.0.2
+Version:5.1.0
Release:0
-Summary:A note taking application for KDE using Akonadi
+Summary:A note taking application using Akonadi
License:GPL-2.0-only AND LGPL-2.1-or-later
Group: System/GUI/KDE
-URL:http://www.kde.org
-Source0:
http://download.kde.org/stable/kjots/%{version}/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM
-Patch0: Fix-bookmarks-actions.patch
-# PATCH-FIX-UPSTREAM
-Patch1: Install-the-kontact-plugin-into-kontact5.patch
-BuildRequires: akonadi-server-devel
+URL:https://userbase.kde.org/KJots/
+Source0:
https://download.kde.org/stable/kjots/%{version}/src/%{name}-%{version}.tar.xz
BuildRequires: extra-cmake-modules
-BuildRequires: grantlee5-devel
-BuildRequires: libxslt-tools
BuildRequires: update-desktop-files
+BuildRequires: cmake(Grantlee5)
+BuildRequires: cmake(KF5Akonadi)
BuildRequires: cmake(KF5AkonadiNotes)
BuildRequires: cmake(KF5Bookmarks)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5ConfigWidgets)
+BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5KCMUtils)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5KontactInterface)
+BuildRequires: cmake(KF5Libkdepim)
BuildRequires: cmake(KF5Mime)
BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KF5PimTextEdit)
-BuildRequires: cmake(KF5TextWidgets)
BuildRequires: cmake(KF5XmlGui)
-BuildRequires: pkgconfig(Qt5DBus)
-BuildRequires: pkgconfig(Qt5PrintSupport)
+BuildRequires: cmake(Qt5DBus)
+BuildRequires: cmake(Qt5PrintSupport)
Recommends: %{name}-lang = %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-This package contains KJOTS, a note taking application for KDE using Akonadi.
+This package contains KJOTS, a note taking application using Akonadi.
%lang_package
%prep
%setup -q
-%autopatch -p1
%build
%cmake_kf5 -d build
@@ -70,30 +64,27 @@
%find_lang %{name}
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
-%doc ANNOUNCE CHANGES COPYING COPYING.LIB README
-%_kf5_appstreamdir/
-%_kf5_applicationsdir/org.kde.kjots.desktop
-%_kf5_bindir/kjots
-%_kf5_configkcfgdir/kjots.kcfg
-%_kf5_kxmlguidir/kjots/
-%_kf5_servicesdir/kjotspart.desktop
-%_kf5_plugindir/kjotspart.so
-%_kf5_plugindir/kcm_kjots.so
-%_kf5_servicesdir/kjots_config_misc.desktop
-%_kf5_sharedir/kjots/
-%_kf5_iconsdir/hicolor/*/apps/kjots.*
-%_kf5_iconsdir/oxygen/*/actions/edit-delete-page.*
+%license COPYING COPYING.LIB
+%doc ANNOUNCE CHANGES README
+%{_kf5_appstreamdir}/
+%{_kf5_applicationsdir}/org.kde.kjots.desktop
+%{_kf5_bindir}/kjots
+%{_kf5_configkcfgdir}/kjots.kcfg
+%{_kf5_kxmlguidir}/kjots/
+%{_kf5_servicesdir}/kjotspart.desktop
+%{_kf5_plugindir}/kjotspart.so
+%{_kf5_plugindir}/kcm_kjots.so
+%{_kf5_servicesdir}/kjots_config_misc.desktop
+%{_kf5_sharedir}/kjots/
+%{_kf5_iconsdir}/hicolor/*/apps/kjots.*
%dir %{_kf5_plugindir}/kontact5/
%{_kf5_plugindir}/kontact5/kontact_kjotsplugin.so
-%{_datadir}/kontact/
+%{_kf5_sharedir}/kontact/
