Accepting request 846603 from KDE:Applications

KDE Applications 20.08.3 (forwarded request 846547 from luca_b)

OBS-URL: https://build.opensuse.org/request/show/846603
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=76

0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch

@@ -1,32 +0,0 @@
-From b2e4ee76d5831df075349a5a597c371a4d9c1460 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Sun, 11 Oct 2020 19:43:58 +0200
-Subject: [PATCH] Bug 427358 - akonadi_ical_resource stuck in
- InvalideCacheForCollection
-
-Readd code removed.
-Thanks for Markus for debugging it
-
-BUG: 427358
-FIXED-IN: 5.15.3
----
- src/agentbase/resourcebase.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/agentbase/resourcebase.cpp b/src/agentbase/resourcebase.cpp
-index 0aa276b21..093b69f74 100644
---- a/src/agentbase/resourcebase.cpp
-+++ b/src/agentbase/resourcebase.cpp
-@@ -668,7 +668,8 @@ void ResourceBasePrivate::slotCollectionDeletionDone(KJob *job)
- void ResourceBasePrivate::slotInvalidateCache(const Akonadi::Collection &collection)
- {
-     Q_Q(ResourceBase);
--    new InvalidateCacheJob(collection, q);
-+    InvalidateCacheJob *job = new InvalidateCacheJob(collection, q);
-+    connect(job, &KJob::result, scheduler, &ResourceScheduler::taskDone);
- }
- 
- void ResourceBase::changeCommitted(const Item &item)
--- 
-2.28.0
-

akonadi-20.08.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3a4b3b3f543734ad5428ca0e573b8dbf9e05f42d51e1aab39b5b5266c16be7d
-size 1588176

akonadi-20.08.2.tar.xz.sig

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl978nkACgkQ29LOiT4t
-HId2vwf/dpPY38vAqSqolr9rn8yt5vqPqkAuvFoLik4joE9KFGPosRzWo+uTB5v5
-1KfB0isx1Rg/0MuWlSSDw3386NKgZr8mJqJkzbp1q8Z1RO86/z9h9Zgb4J47hupm
-5BQzKzcIw/wPm7u8Xd3imjofoGTcYSgaJrSpblKB+vR2LvTno/JXX4CRE14KG3OJ
-vcEcYNWB3q0rrfDLUmdskoELlvjRfW8X9RSQgtwIg08Wrwqfz5aAhSkSZ0UuyYhj
-MCEkRDNqTQJa58gutJ2a6M911pYEzDb7CM2o+zfrJxNzmeycJhqaUUwsw9ESZcj3
-XxUmvbBIYcCaO2MDpA3sMDTXRzOeAQ==
-=BDkm
------END PGP SIGNATURE-----

akonadi-20.08.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:144aea34fbc728a4f4d015194593efad0350375cb7dc565db5827b5688558ac3
+size 1591360

akonadi-20.08.3.tar.xz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl+gqh8ACgkQ29LOiT4t
+HIf0vwf/SyKDyCpHnt7zdsZG7rTPHh6VdFJT37cYOHKthB9M/hOZfiqr0km5yx34
+hOP0d4FHANFW94BULsogqRw8lPp25dAVydep8WRGTMSpDGZUhAZntkeHtvlVJBGO
+r8zNJABKlzutI0nfRfAwYUMLwsx/gCNqJz0B1GJonuDp0weGnA8fj8hgTuLEgTMX
+IzDds3Es2UOKiu/MaohGmHqWnPRN3L13jodfje3fBxAq12FPguqFVONWs6XCmzRv
+/CwckmNVpmprFkl3YvDhwfNj+8SEieuteqJZE/YKwGjHAODqMzUlKJ5plKr5QHA7
+DkKsCbOZGP+xme4j9Tqll0fIAUtYZg==
+=pNds
+-----END PGP SIGNATURE-----

akonadi-server.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Nov  5 22:45:08 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
+
+- Update to 20.08.3
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/releases/2020-11-apps-update
+- Changes since 20.08.2:
+  * Bug 427358 - akonadi_ical_resource stuck in InvalideCacheForCollection (kde#427358)
+- Dropped patches, now upstream:
+  * 0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch
+
 -------------------------------------------------------------------
 Mon Oct 12 07:01:33 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
 

akonadi-server.spec

@@ -22,7 +22,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-server
-Version:        20.08.2
+Version:        20.08.3
 Release:        0
 Summary:        PIM Storage Service
 License:        LGPL-2.1-or-later
@@ -30,8 +30,6 @@ Group:          System/GUI/KDE
 URL:            https://akonadi-project.org
 Source:         https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
 Source99:       akonadi-server-rpmlintrc
-# PATCH-FIX-UPSTREAM
-Patch0:         0001-Bug-427358-akonadi_ical_resource-stuck-in-InvalideCa.patch
 BuildRequires:  extra-cmake-modules >= %{kf5_version}
 BuildRequires:  kf5-filesystem
 BuildRequires:  libQt5Sql-private-headers-devel