diff --git a/akonadi-19.08.3.tar.xz b/akonadi-19.08.3.tar.xz deleted file mode 100644 index aa170e3..0000000 --- a/akonadi-19.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfdfa4767b1bd420c7979cf5125cc56d3926181f8484dc39ecd84a9e0808ee6c -size 1579468 diff --git a/akonadi-19.08.3.tar.xz.sig b/akonadi-19.08.3.tar.xz.sig deleted file mode 100644 index 752f2b2..0000000 --- a/akonadi-19.08.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3A/M4ACgkQ29LOiT4t -HIf7sQf+LYfkx5E/thqRB9Rvx1Vtg81Wu1uVFrpd41pZATASyl80amLGPl8q/1JF -oR+CsE9dzYsGhi35U3AWykNm3nF9Zv+kqCh5xp9TCV+bvJNhnF15yI/nWoEqBYg/ -JDwkvR+EztpkPAhJ7gpZnWnM+QXBESfhvlvoswd+kwXp0zkBGdXVVbokWD2mZ8q5 -1Lcj46FWpK0wK9URWukONdLsgENfQOsMcQoVjHS5yT7CCkoi0q+h+UJsGCbcPU0U -hKQRngAyb5AOQwQfqlbRS2ge5haukZMsgRqo74P+K4HIo26Fp9evXBEI1slilOio -FuusYlghnVPYawPKnZvc3/MBNOhH8A== -=7rOa ------END PGP SIGNATURE----- diff --git a/akonadi-19.11.80.tar.xz b/akonadi-19.11.80.tar.xz new file mode 100644 index 0000000..be10a9d --- /dev/null +++ b/akonadi-19.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42e92dc06da05041ac6892901dbc92bd8748cdc0ca048599aada2c8b4bec82b9 +size 1578596 diff --git a/akonadi-19.11.80.tar.xz.sig b/akonadi-19.11.80.tar.xz.sig new file mode 100644 index 0000000..2174061 --- /dev/null +++ b/akonadi-19.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl3Obv8ACgkQOmpNuDnq +ptcH6Q//ZaoL560siUVpiJolwdEImHX7e9+EUivnyqon9IUqvStwn3egmoMQbvK4 +HZjvAfYWisCKbN/ZEjMSQrFBz3kNKYM3D50A6x0/jRiKdEV8rqAXLwydtxXjwIQf +bd+0I9JEUytKnJDw7D3nLnmzVrHuyIetwgG99ZywWq9OTxTZPn1fKmwUmXPvbnmX +cNwlsPORLD+er07fkNZC5KUeCu1mP8nkSmQV9DT7WWm/YvYm5VAHVv2xe3t1Kpyz +2kh1DQSAbNk7bivydzu/Sx0LJcea4GPMy05A0sgtshZvsloQ8ViCEVUEV/6j7ut2 +A7U1ubNVu/sDsIpQIO9tuqSN9m09+P1hX9Ahvwhy0d5nak4/otz3GCrOyOREWpGb +09RiLuejNIV2KI5PST9IUSt0BzjQV3blJBEh/+lIDhxr/MAZofOQC+mtbxl/YyQA +qoC+f7sgzMro62frFdWbk6hgtfNwpGj0cV2zGs1wXzRAQDPNc4HtJpdXgDPgOUDl +/XsaBXj5rXVCwDkUnjl83wdSBptynyuxJSYzjw9ybg1cssz7D4UBDH2VQPQo8g4H +DmAUkWU1nFyYMP1YmMCgJTuyRVzFuyKBcPkvMemXevlkBhG5JvIkFaDCaoyRko8x +9g638OOwUJ9wA0uvZB/oZZcM7LVgHcZaaBianyhssQzZBrFSGWs= +=d/yM +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index b4f26c0..df2481b 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Nov 24 13:28:53 UTC 2019 - Luca Beltrame + +- Update to 19.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.12-beta.php +- Too many changes to list here. + ------------------------------------------------------------------- Thu Nov 7 23:12:26 UTC 2019 - Luca Beltrame @@ -24,7 +33,7 @@ Thu Sep 5 13:59:50 UTC 2019 - Luca Beltrame * For more details please see: * https://www.kde.org/announcements/announce-applications-19.08.1.php - Changes since 19.08.0: - * Fix Bug 403208 - Short name of favorite folder results in improperly shown number of unread messages (kde#403208) + * Fix Bug 403208 - Short name of favorite folder results in improperly shown number of unread messages (kde#403208) * Include KDE* cmake macros before any others ------------------------------------------------------------------- diff --git a/akonadi-server.spec b/akonadi-server.spec index a9f3895..0a53a9b 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -1,7 +1,7 @@ # # spec file for package akonadi-server # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,20 @@ %define rname akonadi -%define kf5_version 5.26.0 +%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 19.08.3 +Version: 19.11.80 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://akonadi-project.org -Source: https://download.kde.org/stable/applications/%{version}/src/%{rname}-%{version}.tar.xz +Source: https://download.kde.org/unstable/applications/%{version}/src/%{rname}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/applications/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/applications/%{version}/src/%{rname}-%{version}.tar.xz.sig Source2: applications.keyring %endif Source99: akonadi-server-rpmlintrc @@ -38,15 +38,17 @@ BuildRequires: cmake >= 3.0.0 BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel +BuildRequires: libboost_graph-devel +BuildRequires: libboost_headers-devel BuildRequires: libxml2 BuildRequires: libxslt BuildRequires: libxslt-devel BuildRequires: libxslt-tools BuildRequires: mariadb -BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: shared-mime-info BuildRequires: sqlite3-devel +BuildRequires: cmake(KAccounts) BuildRequires: cmake(KF5Completion) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5Crash) @@ -59,15 +61,15 @@ BuildRequires: cmake(KF5ItemModels) BuildRequires: cmake(KF5ItemViews) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Designer) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Xml) Requires: libqt5-sql-mysql Requires: mysql Requires(post): shared-mime-info @@ -78,21 +80,10 @@ Provides: akonadi5 = %{version} # Needed for users of unstable repositories Obsoletes: akonadi < %{version} Obsoletes: akonadi-runtime < %{version} -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_graph-devel -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif -%if 0%{?suse_version} < 1330 -# It does not build with the default compiler (GCC 4.8) on Leap 42.x -%if 0%{?sle_version} < 120300 -BuildRequires: gcc6-c++ -%else -BuildRequires: gcc7-c++ -%endif -%endif Recommends: %{name}-lang +# FIXME: Check if it's worth it +Recommends: kaccounts-integration +Recommends: kaccounts-providers %description This package contains the data files of Akonadi, the KDE PIM storage @@ -151,26 +142,22 @@ Akonadi server's SQlite plugin. Summary: Akonadi Framework: Build Environment Group: Development/Libraries/X11 Requires: %{name} = %{version} -Requires: kcompletion-devel -Requires: kdelibs4support-devel -Requires: kitemmodels-devel -Requires: kjobwidgets-devel -Requires: kservice-devel -Requires: kxmlgui-devel Requires: libKF5AkonadiAgentBase5 = %{version} Requires: libKF5AkonadiCore5 = %{version} Requires: libKF5AkonadiWidgets5 = %{version} -Requires: solid-devel -Requires: pkgconfig(Qt5Network) +Requires: libboost_headers-devel +Requires: cmake(KF5Completion) +Requires: cmake(KF5ItemModels) +Requires: cmake(KF5JobWidgets) +Requires: cmake(KF5KDELibs4Support) +Requires: cmake(KF5Service) +Requires: cmake(KF5Solid) +Requires: cmake(KF5XmlGui) +Requires: cmake(Qt5Network) Conflicts: libakonadiprotocolinternals-devel Obsoletes: akonadi-devel < %{version} Obsoletes: libKF5AkonadiPrivate-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version} -%if 0%{?suse_version} > 1325 -Requires: libboost_headers-devel -%else -Requires: boost-devel -%endif %description devel This package contains development files of Akonadi, the KDE PIM storage @@ -182,17 +169,7 @@ service. %setup -q -n %{rname}-%{version} %build - %if 0%{?suse_version} < 1330 - # It does not build with the default compiler (GCC 4.8) on Leap 42.x - %if 0%{?sle_version} < 120300 - export CC=gcc-6 - export CXX=g++-6 - %else - export CC=gcc-7 - export CXX=g++-7 - %endif - %endif - %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} + %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} -DINSTALL_APPARMOR=FALSE %make_jobs %install diff --git a/applications.keyring b/applications.keyring index 57c966e..48be415 100644 Binary files a/applications.keyring and b/applications.keyring differ