diff --git a/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch b/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch deleted file mode 100644 index 70f7fd5..0000000 --- a/0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0ec637813bd04d042607ad2d36b70f61e4db7f70 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Tue, 16 Jul 2019 17:34:58 +0200 -Subject: [PATCH] Revert "Adapt DBInitializer to behavior change of QPSQL - driver in Qt 5.13" - -This reverts commit 74aed9542ba1ff1e6e93a550c42869647c4eba8e. -Apparently it breaks things with MySQL/MariaDB. - -We don't really need this fix anyway as we reverted the corresponding -change in Qt. - -References: boo#1141604, kde#409753 ---- - src/server/storage/dbintrospector.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/server/storage/dbintrospector.cpp b/src/server/storage/dbintrospector.cpp -index 70d952a6f..224faf7f8 100644 ---- a/src/server/storage/dbintrospector.cpp -+++ b/src/server/storage/dbintrospector.cpp -@@ -76,7 +76,7 @@ bool DbIntrospector::hasColumn(const QString &tableName, const QString &columnNa - QStringList columns = m_columnCache.value(tableName); - - if (columns.isEmpty()) { -- const QSqlRecord table = m_database.record(tableName.toLower()); -+ const QSqlRecord table = m_database.record(tableName); - const int numTables = table.count(); - columns.reserve(numTables); - for (int i = 0; i < numTables; ++i) { --- -2.16.4 - diff --git a/akonadi-19.04.3.tar.xz b/akonadi-19.04.3.tar.xz deleted file mode 100644 index 84d78c5..0000000 --- a/akonadi-19.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ac34dc7c3e2bf8e53ec9eebeecc8d96541c0b663dd71963e6bcd94e7ac41b07 -size 1574868 diff --git a/akonadi-19.08.0.tar.xz b/akonadi-19.08.0.tar.xz new file mode 100644 index 0000000..c82ccfc --- /dev/null +++ b/akonadi-19.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff53f078b024f2674a8b2990515f5cbafe2bc965390d74a464b2a044aee32831 +size 1576124 diff --git a/akonadi-19.08.0.tar.xz.sig b/akonadi-19.08.0.tar.xz.sig new file mode 100644 index 0000000..89a1be2 --- /dev/null +++ b/akonadi-19.08.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl1MxmkACgkQ29LOiT4t +HIf8TAf+JMt7rz1HRwZ4uGD572zFbO0cMtcOjmnr0Bw8V0BODDqATmFHeHT9LbpN +IDMAVZrra4Qv8dhWk6baUj54wKfyBQny8/0VUwTfYFUmftIUoRolT2KJxlx0DVsp +7vbISU9AtoigCTPjlQF5+sI0I6OK+bdJc58OtsgeBkv9o2YgAWWrC1DQECOS7lr6 +LvRS7dPKBvyqm1SgVi0ys/taKsoPdJ/w1a3mhn2ZSrdt+pgBrQIQ7bwaPkQXq/Fz +eEG1wiBB6FgDEb+3258w0G2h6Xw/yM6tzTXJzapyWxkfJIFwklAenNIA/wRg0E3o +N4FyV4TfevCV+EgrF0brrjXBwtG7mg== +=unQr +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index 94fdc3e..4899316 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Aug 9 08:29:50 UTC 2019 - Christophe Giboudeaux + +- Update to 19.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08.0.php +- No code change since 19.07.90 + +------------------------------------------------------------------- +Tue Aug 06 16:50:46 UTC 2019 - lbeltrame@kde.org + +- Update to 19.07.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08-rc.php +- Changes since 19.07.80: + * Fix compatibility with QMYSQL driver after 74aed95 +- Dropped patches, superseded by upstream changes: + * 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch + +------------------------------------------------------------------- +Tue Jul 23 11:58:54 UTC 2019 - lbeltrame@kde.org + +- Update to 19.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08-beta.php +- Changes since 19.04.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Jul 18 19:46:45 UTC 2019 - Stefan Brüns diff --git a/akonadi-server.spec b/akonadi-server.spec index 3e52584..e7e631e 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -22,16 +22,18 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 19.04.3 +Version: 19.08.0 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later Group: System/GUI/KDE -URL: http://akonadi-project.org -Source: %{rname}-%{version}.tar.xz +URL: https://akonadi-project.org +Source: https://download.kde.org/stable/applications/%{version}/src/%{rname}-%{version}.tar.xz +%if %{with lang} +Source1: https://download.kde.org/stable/applications/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif Source99: akonadi-server-rpmlintrc -# PATCH-FIX-OPENSUSE -Patch0: 0001-Revert-Adapt-DBInitializer-to-behavior-change-of-QPS.patch BuildRequires: cmake >= 3.0.0 BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem @@ -178,7 +180,6 @@ service. %prep %setup -q -n %{rname}-%{version} -%autopatch -p1 %build %if 0%{?suse_version} < 1330 diff --git a/applications.keyring b/applications.keyring new file mode 100644 index 0000000..57c966e Binary files /dev/null and b/applications.keyring differ