From 7226df3085576eb3cc1f311dd07e360f2400a7e51415dffdc09a0daae2730b2a Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 26 Mar 2017 07:14:07 +0000 Subject: [PATCH 1/7] KDE Applications 17.08.80 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=98 --- akonadi-16.12.3.tar.xz | 3 - akonadi-17.03.80.tar.xz | 3 + akonadi-server.changes | 48 +++-- akonadi-server.spec | 11 +- handle-mysql-process-crashes-gracefully.patch | 196 ------------------ 5 files changed, 36 insertions(+), 225 deletions(-) delete mode 100644 akonadi-16.12.3.tar.xz create mode 100644 akonadi-17.03.80.tar.xz delete mode 100644 handle-mysql-process-crashes-gracefully.patch diff --git a/akonadi-16.12.3.tar.xz b/akonadi-16.12.3.tar.xz deleted file mode 100644 index 6ab1445..0000000 --- a/akonadi-16.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc48a200c27331d5a9ac6bfb8d7d61f3c4240f133bb23c996c78493f24644b03 -size 1037568 diff --git a/akonadi-17.03.80.tar.xz b/akonadi-17.03.80.tar.xz new file mode 100644 index 0000000..79d8a2b --- /dev/null +++ b/akonadi-17.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e677f6ec1d546cf2ea72e3921d45664be628bba1f970d7905000363bf75bf799 +size 1038768 diff --git a/akonadi-server.changes b/akonadi-server.changes index d8fae95..9649ac8 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,8 +1,18 @@ +------------------------------------------------------------------- +Sat Mar 25 23:10:05 CET 2017 - lbeltrame@kde.org + +- Update to 17.03.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.03.80.php +- Changes since 16.12.3: + * Too many changes to list here + ------------------------------------------------------------------- Thu Mar 9 18:07:28 UTC 2017 - alarrosa@suse.com - Drop fix-itemretriever-in-case-of-concurrent-requests.patch, it's - already merged upstream + already merged upstream ------------------------------------------------------------------- Thu Mar 9 12:33:17 CET 2017 - lbeltrame@kde.org @@ -30,7 +40,7 @@ Thu Mar 9 12:33:17 CET 2017 - lbeltrame@kde.org Fri Feb 24 13:14:48 UTC 2017 - lbeltrame@kde.org - Add fix-itemretriever-in-case-of-concurrent-requests.patch - * Fix hangs accessing folders ("Retrieving folder contents" + * Fix hangs accessing folders ("Retrieving folder contents" going on infinitely) ------------------------------------------------------------------- @@ -55,7 +65,7 @@ Sun Jan 22 17:10:01 UTC 2017 - hrvoje.senjan@gmail.com Sat Jan 14 08:48:19 UTC 2017 - lbeltrame@kde.org - - Update to KDE Applications 16.12.1 - * KDE Applications 16.12.1 + * KDE Applications 16.12.1 * https://www.kde.org/announcements/announce-applications-16.12.1.php - Drop upstream patch fix-connect-api.patch @@ -63,14 +73,14 @@ Sat Jan 14 08:48:19 UTC 2017 - lbeltrame@kde.org ------------------------------------------------------------------- Tue Dec 27 19:44:22 UTC 2016 - tittiatcoke@gmail.com -- Add upstream patch fix-connect-api.patch in order to fix the +- Add upstream patch fix-connect-api.patch in order to fix the subscribe/unsubscribe IMAP folders ------------------------------------------------------------------- Tue Dec 13 19:27:48 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.12.0 - * KDE Applications 16.12.0 + * KDE Applications 16.12.0 * https://www.kde.org/announcements/announce-applications-16.12.0.php @@ -208,7 +218,7 @@ Thu Apr 28 05:36:04 UTC 2016 - lbeltrame@kde.org Wed Apr 27 21:40:31 UTC 2016 - lbeltrame@kde.org - Move dbus xml files to the akonadi-devel package -- Make the devel package conflict with +- Make the devel package conflict with libakonadiprotocolinternals-devel ------------------------------------------------------------------- @@ -231,7 +241,7 @@ Mon Apr 11 06:29:53 UTC 2016 - tittiatcoke@gmail.com Sun Mar 13 15:32:26 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.3 - * KDE Applications 15.12.3 + * KDE Applications 15.12.3 * https://www.kde.org/announcements/announce-applications-15.12.3.php * boo#970855 @@ -240,7 +250,7 @@ Sun Mar 13 15:32:26 UTC 2016 - tittiatcoke@gmail.com Sat Feb 13 07:59:56 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.2 - * KDE Applications 15.12.2 + * KDE Applications 15.12.2 * https://www.kde.org/announcements/announce-applications-15.12.2.php * boo#966605 @@ -248,14 +258,14 @@ Sat Feb 13 07:59:56 UTC 2016 - tittiatcoke@gmail.com ------------------------------------------------------------------- Tue Jan 25 16:00:35 UTC 2016 - tittiatcoke@gmail.com -- Obsolete the old akonadi-runtime for Factory/TW due to the +- Obsolete the old akonadi-runtime for Factory/TW due to the switch to kdepim5 as default ------------------------------------------------------------------- Sat Jan 9 18:08:35 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.1 - * KDE Applications 15.12.1 + * KDE Applications 15.12.1 * https://www.kde.org/announcements/announce-applications-15.12.1.php * boo#961265 @@ -264,7 +274,7 @@ Sat Jan 9 18:08:35 UTC 2016 - tittiatcoke@gmail.com Sun Dec 13 12:45:30 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.12.0 - * KDE Applications 15.12.0 + * KDE Applications 15.12.0 * https://www.kde.org/announcements/announce-applications-15.12.0.php * boo#958887 @@ -273,7 +283,7 @@ Sun Dec 13 12:45:30 UTC 2015 - tittiatcoke@gmail.com Tue Nov 10 19:51:55 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.3 - * KDE Applications 15.08.3 + * KDE Applications 15.08.3 * https://www.kde.org/announcements/announce-applications-15.08.3.php * boo#954531 @@ -282,7 +292,7 @@ Tue Nov 10 19:51:55 UTC 2015 - tittiatcoke@gmail.com Sun Oct 11 13:14:41 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.2 - * KDE Applications 15.08.2 + * KDE Applications 15.08.2 * https://www.kde.org/announcements/announce-applications-15.08.2.php @@ -290,7 +300,7 @@ Sun Oct 11 13:14:41 UTC 2015 - tittiatcoke@gmail.com Sun Sep 13 18:54:20 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.08.1 - * KDE Applications 15.08.1 + * KDE Applications 15.08.1 * https://www.kde.org/announcements/announce-applications-15.08.1.php - Drop upstream patch akonadi-fix-licenses.diff @@ -329,7 +339,7 @@ Fri Aug 7 07:33:31 UTC 2015 - tittiatcoke@gmail.com Tue Jun 30 05:31:19 UTC 2015 - lbeltrame@kde.org - Add do-not-leak-old-external-payload-files.diff: do not leak - external payload files, fixes disk usage of akonadi file_db_data + external payload files, fixes disk usage of akonadi file_db_data (kde#341884) ------------------------------------------------------------------- @@ -356,7 +366,7 @@ Fri Aug 15 08:07:44 UTC 2014 - tittiatcoke@gmail.com * Fixed tag RID fetch * Fixed HRID-based fetches * Fixed race condition in StorageDebugger - * Use FindBacktrace.cmake from CMake 3.0 instead of our own + * Use FindBacktrace.cmake from CMake 3.0 instead of our own detection ------------------------------------------------------------------- @@ -400,7 +410,7 @@ Thu Mar 27 17:34:53 UTC 2014 - tittiatcoke@gmail.com ------------------------------------------------------------------- Sun Mar 23 12:44:34 UTC 2014 - tittiatcoke@gmail.com -- Add upstream patch do-not-emit-itemchanged.diff to prevent +- Add upstream patch do-not-emit-itemchanged.diff to prevent baloo from constantly indexing the maildir ------------------------------------------------------------------- @@ -425,8 +435,8 @@ Fri Mar 14 15:25:04 UTC 2014 - tittiatcoke@gmail.com ------------------------------------------------------------------- Wed Mar 12 14:29:11 UTC 2014 - tittiatcoke@gmail.com -- Add upstream patches fix-postgresql-query.diff, - fix-postgresql-2.diff to fix the issue when migrating an existing +- Add upstream patches fix-postgresql-query.diff, + fix-postgresql-2.diff to fix the issue when migrating an existing PostgreSQL database - Add upstream patch fix-mailrefresh.diff to fix the issue around automatically refreshing emails diff --git a/akonadi-server.spec b/akonadi-server.spec index 26296b4..a34da6f 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -17,20 +17,18 @@ %define rname akonadi -%define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) -%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Name: akonadi-server -Version: 16.12.3 +Version: 17.03.80 Release: 0 +%define kf5_version 5.26.0 +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: PIM Storage Service License: LGPL-2.1+ Group: System/GUI/KDE Url: http://akonadi-project.org Source: %{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc -# PATCH-FIX-UPSTREAM handle-mysql-process-crashes-gracefully.patch -Patch0: handle-mysql-process-crashes-gracefully.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -169,7 +167,6 @@ service. %prep %setup -q -n %{rname}-%{version} -%patch0 -p1 %build %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} diff --git a/handle-mysql-process-crashes-gracefully.patch b/handle-mysql-process-crashes-gracefully.patch deleted file mode 100644 index b36ae3d..0000000 --- a/handle-mysql-process-crashes-gracefully.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 4c5ca9bf32e5a9d569e83f66a439c65d8939a540 Mon Sep 17 00:00:00 2001 -From: Martin Koller -Date: Sat, 21 Jan 2017 12:11:14 +0100 -Subject: handle mysql process crashes gracefully - -This patch checks if the mysqld stops unexpectedly when it was started -from akonadiserver and tells the latter to quit when a -stopped mysqld was discovered. -Also in this case the local socket file is removed so that -a restart can work without problem. -REVIEW: 129264 ---- - src/server/storage/dbconfigmysql.cpp | 69 +++++++++++++++++++++++++++++++++--- - src/server/storage/dbconfigmysql.h | 11 ++++-- - 2 files changed, 72 insertions(+), 8 deletions(-) - -diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 0962ccb..7631890 100644 ---- a/src/server/storage/dbconfigmysql.cpp -+++ b/src/server/storage/dbconfigmysql.cpp -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - using namespace Akonadi; - using namespace Akonadi::Server; -@@ -190,6 +191,8 @@ bool DbConfigMysql::startInternalServer() - const QString dataDir = StandardDirs::saveDir("data", QStringLiteral("db_data")); - #ifndef Q_OS_WIN - const QString socketDirectory = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); -+ const QString socketFile = QStringLiteral("%1/mysql.socket").arg(socketDirectory); -+ const QString pidFileName = QStringLiteral("%1/mysql.pid").arg(socketDirectory); - #endif - - // generate config file -@@ -289,6 +292,39 @@ bool DbConfigMysql::startInternalServer() - qCCritical(AKONADISERVER_LOG) << "MySQL cannot deal with a socket path this long. Path was: " << socketDirectory; - return false; - } -+ -+ // If mysql.socket file exists, check if also the server process is still running, -+ // else we can safely remove the socket file (cleanup after a system crash, etc.) -+ QFile pidFile(pidFileName); -+ if (QFile::exists(socketFile) && pidFile.open(QIODevice::ReadOnly)) { -+ qCDebug(AKONADISERVER_LOG) << "Found a mysqld pid file, checking whether the server is still running..."; -+ QByteArray pid = pidFile.readLine().trimmed(); -+ QFile proc(QString::fromLatin1("/proc/" + pid + "/stat")); -+ // Check whether the process with the PID from pidfile still exists and whether -+ // it's actually still mysqld or, whether the PID has been recycled in the meanwhile. -+ bool serverIsRunning = false; -+ if (proc.open(QIODevice::ReadOnly)) { -+ const QByteArray stat = proc.readAll(); -+ const QList stats = stat.split(' '); -+ if (stats.count() > 1) { -+ // Make sure the PID actually belongs to mysql process -+ if (stats[1] == "(mysqld)") { -+ // Yup, our mysqld is actually running, so pretend we started the server -+ // and try to connect to it -+ qCWarning(AKONADISERVER_LOG) << "mysqld for Akonadi is already running, trying to connect to it."; -+ serverIsRunning = true; -+ } -+ } -+ proc.close(); -+ } -+ -+ if (!serverIsRunning) { -+ qCDebug(AKONADISERVER_LOG) << "No mysqld process with specified PID is running. Removing the pidfile and starting a new instance..."; -+ pidFile.close(); -+ pidFile.remove(); -+ QFile::remove(socketFile); -+ } -+ } - #endif - - // synthesize the mysqld command -@@ -296,14 +332,15 @@ bool DbConfigMysql::startInternalServer() - arguments << QStringLiteral("--defaults-file=%1/mysql.conf").arg(akDir); - arguments << QStringLiteral("--datadir=%1/").arg(dataDir); - #ifndef Q_OS_WIN -- arguments << QStringLiteral("--socket=%1/mysql.socket").arg(socketDirectory); -+ arguments << QStringLiteral("--socket=%1").arg(socketFile); -+ arguments << QStringLiteral("--pid-file=%1").arg(pidFileName); - #else - arguments << QString::fromLatin1("--shared-memory"); - #endif - - // If mysql.socket file does not exists, then we must start the server, - // otherwise we reconnect to it -- if (!QFile::exists(QStringLiteral("%1/mysql.socket").arg(socketDirectory))) { -+ if (!QFile::exists(socketFile)) { - // move mysql error log file out of the way - const QFileInfo errorLog(dataDir + QDir::separator() + QLatin1String("mysql.err")); - if (errorLog.exists()) { -@@ -348,9 +385,11 @@ bool DbConfigMysql::startInternalServer() - return false; - } - -- #ifndef Q_OS_WIN -+ connect(mDatabaseProcess, static_cast(&QProcess::finished), -+ this, &DbConfigMysql::processFinished); -+ -+#ifndef Q_OS_WIN - // wait until mysqld has created the socket file (workaround for QTBUG-47475 in Qt5.5.0) -- QString socketFile = QStringLiteral("%1/mysql.socket").arg(socketDirectory); - int counter = 50; // avoid an endless loop in case mysqld terminated - while ((counter-- > 0) && !QFileInfo::exists(socketFile)) { - QThread::msleep(100); -@@ -358,7 +397,6 @@ bool DbConfigMysql::startInternalServer() - #endif - } else { - qCDebug(AKONADISERVER_LOG) << "Found mysql.socket file, reconnecting to the database"; -- mDatabaseProcess = new QProcess(); - } - - const QLatin1String initCon("initConnection"); -@@ -378,7 +416,7 @@ bool DbConfigMysql::startInternalServer() - if (opened) { - break; - } -- if (mDatabaseProcess->waitForFinished(500)) { -+ if (mDatabaseProcess && mDatabaseProcess->waitForFinished(500)) { - qCCritical(AKONADISERVER_LOG) << "Database process exited unexpectedly during initial connection!"; - qCCritical(AKONADISERVER_LOG) << "executable:" << mMysqldPath; - qCCritical(AKONADISERVER_LOG) << "arguments:" << arguments; -@@ -459,12 +497,33 @@ bool DbConfigMysql::startInternalServer() - return success; - } - -+void DbConfigMysql::processFinished(int exitCode, QProcess::ExitStatus exitStatus) -+{ -+ Q_UNUSED(exitCode); -+ Q_UNUSED(exitStatus); -+ -+ qCCritical(AKONADISERVER_LOG) << "database server stopped unexpectedly"; -+ -+#ifndef Q_OS_WIN -+ // when the server stopped unexpectedly, make sure to remove the stale socket file since otherwise -+ // it can not be started again -+ const QString socketDirectory = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); -+ const QString socketFile = QStringLiteral("%1/mysql.socket").arg(socketDirectory); -+ QFile::remove(socketFile); -+#endif -+ -+ QCoreApplication::quit(); -+} -+ - void DbConfigMysql::stopInternalServer() - { - if (!mDatabaseProcess) { - return; - } - -+ disconnect(mDatabaseProcess, static_cast(&QProcess::finished), -+ this, &DbConfigMysql::processFinished); -+ - // first, try the nicest approach - if (!mCleanServerShutdownCommand.isEmpty()) { - QProcess::execute(mCleanServerShutdownCommand); -diff --git a/src/server/storage/dbconfigmysql.h b/src/server/storage/dbconfigmysql.h -index 27841e8..a25f28b 100644 ---- a/src/server/storage/dbconfigmysql.h -+++ b/src/server/storage/dbconfigmysql.h -@@ -21,14 +21,16 @@ - #define DBCONFIGMYSQL_H - - #include "dbconfig.h" -- --class QProcess; -+#include -+#include - - namespace Akonadi { - namespace Server { - --class DbConfigMysql : public DbConfig -+class DbConfigMysql : public QObject, public DbConfig - { -+ Q_OBJECT -+ - public: - DbConfigMysql(); - -@@ -75,6 +77,9 @@ public: - /// reimpl - void initSession(const QSqlDatabase &database) Q_DECL_OVERRIDE; - -+private Q_SLOTS: -+ void processFinished(int exitCode, QProcess::ExitStatus exitStatus); -+ - private: - int parseCommandLineToolsVersion() const; - --- -cgit v0.11.2 From eea7e68de79eb3a751e8ae14ee5f6c414d0920fca1be97f83a6ffba3a9b04821 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 30 Mar 2017 05:29:05 +0000 Subject: [PATCH 2/7] - Drop upstreamed patch: handle-mysql-process-crashes-gracefully.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=99 --- akonadi-server.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/akonadi-server.changes b/akonadi-server.changes index 9649ac8..08162bb 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 05:28:34 UTC 2017 - lbeltrame@kde.org + +- Drop upstreamed patch: handle-mysql-process-crashes-gracefully.patch + ------------------------------------------------------------------- Sat Mar 25 23:10:05 CET 2017 - lbeltrame@kde.org From 1c4082917b3dc6a22c209858531df9d7b5391e2dcfddbed08e008bdb7941affa Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 12 Apr 2017 14:38:35 +0000 Subject: [PATCH 3/7] RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=100 --- akonadi-17.03.80.tar.xz | 3 --- akonadi-17.03.90.tar.xz | 3 +++ akonadi-server.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 akonadi-17.03.80.tar.xz create mode 100644 akonadi-17.03.90.tar.xz diff --git a/akonadi-17.03.80.tar.xz b/akonadi-17.03.80.tar.xz deleted file mode 100644 index 79d8a2b..0000000 --- a/akonadi-17.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e677f6ec1d546cf2ea72e3921d45664be628bba1f970d7905000363bf75bf799 -size 1038768 diff --git a/akonadi-17.03.90.tar.xz b/akonadi-17.03.90.tar.xz new file mode 100644 index 0000000..f146bd2 --- /dev/null +++ b/akonadi-17.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76aebd2207a36151f95bff403d2d736fea8b6a97b5f377e56cf4c94c55847b33 +size 1300928 diff --git a/akonadi-server.spec b/akonadi-server.spec index a34da6f..6959291 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -1,7 +1,7 @@ # # spec file for package akonadi-server # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define rname akonadi Name: akonadi-server -Version: 17.03.80 +Version: 17.03.90 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From 222bf4e4716ee4230e5957cbcf3b31125b83795de0b5726b717cafc561145756 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 12 Apr 2017 18:38:19 +0000 Subject: [PATCH 4/7] Update changes file - Automated commit, please verify contents OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=101 --- akonadi-server.changes | 17 +++++++++++++++++ akonadi-server.spec | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index 08162bb..0f4f3d4 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Apr 12 20:25:10 CEST 2017 - lbeltrame@kde.org + +- Update to 17.03.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04-rc.php +- Changes since 17.03.80: + * Fix some -Wdocumentation warnings + * Fix redefinition of QAddConst + * Port some foreach code + * ResourceBase: cancelTask() when PrepareItemsRetrieval job returns 0 items + * Handle nested exceptions during error handling + * Improve some ETM warnings + * abi::__forced_unwind is only part of gnu's libstc++. + * Remove unused include + ------------------------------------------------------------------- Thu Mar 30 05:28:34 UTC 2017 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 6959291..1202d44 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -1,7 +1,7 @@ # # spec file for package akonadi-server # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From d3cec1f5489b56168986cfaf4955410d244df104a4ceac6a622885dfff06e52a Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 13:27:44 +0000 Subject: [PATCH 5/7] Make a merry car great again OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=102 --- akonadi-server.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/akonadi-server.spec b/akonadi-server.spec index 1202d44..52ce8f9 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -16,6 +16,8 @@ # +%bcond_without lang + %define rname akonadi Name: akonadi-server Version: 17.03.90 @@ -165,6 +167,10 @@ Provides: libKF5AkonadiPrivate-devel = %{version} This package contains development files of Akonadi, the KDE PIM storage service. +%if %{with lang} +%lang_package +%endif + %prep %setup -q -n %{rname}-%{version} @@ -174,6 +180,9 @@ service. %install %kf5_makeinstall -C build + %if %{with lang} + %find_lang %{name} --with-man --all-name + %endif %post /sbin/ldconfig @@ -264,4 +273,9 @@ service. %{_libdir}/libKF5AkonadiXml.so %{_libdir}/qt5/mkspecs/modules/qt_AkonadiXml.pri +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog From bd394ebf86f8477209c622d45dbfc7cf128c45ebd956b808b09f12796a94a6be Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 16 Apr 2017 13:54:17 +0000 Subject: [PATCH 6/7] KDE Applications 17.04 final OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=103 --- akonadi-17.03.90.tar.xz | 3 --- akonadi-17.04.0.tar.xz | 3 +++ akonadi-server.changes | 12 ++++++++++++ akonadi-server.spec | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 akonadi-17.03.90.tar.xz create mode 100644 akonadi-17.04.0.tar.xz diff --git a/akonadi-17.03.90.tar.xz b/akonadi-17.03.90.tar.xz deleted file mode 100644 index f146bd2..0000000 --- a/akonadi-17.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76aebd2207a36151f95bff403d2d736fea8b6a97b5f377e56cf4c94c55847b33 -size 1300928 diff --git a/akonadi-17.04.0.tar.xz b/akonadi-17.04.0.tar.xz new file mode 100644 index 0000000..86bcf82 --- /dev/null +++ b/akonadi-17.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:962f7694ff67e32b965a07da282d2af7a0777353b11f537c147c8777b03901d4 +size 1301104 diff --git a/akonadi-server.changes b/akonadi-server.changes index 0f4f3d4..481e712 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Apr 16 10:44:43 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.0.php +- Changes since 17.03.90: + * Remove unused variable + * Remove compile warning + * Update search query from CollectionModifyJob + ------------------------------------------------------------------- Wed Apr 12 20:25:10 CEST 2017 - lbeltrame@kde.org diff --git a/akonadi-server.spec b/akonadi-server.spec index 52ce8f9..151bbb0 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -20,7 +20,7 @@ %define rname akonadi Name: akonadi-server -Version: 17.03.90 +Version: 17.04.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) From 1ad422b97ed2615dd93391ffa939364260d806ff21ac364dcc1b55afaac9d344 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 20 Apr 2017 08:45:27 +0000 Subject: [PATCH 7/7] Add Recommends: %{name}-lang OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=104 --- akonadi-server.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/akonadi-server.spec b/akonadi-server.spec index 151bbb0..60aa530 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -78,6 +78,7 @@ Obsoletes: akonadi5 < %{version} Provides: akonadi5 = %{version} # Needed for users of unstable repositories Obsoletes: akonadi < %{version} +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1320 Obsoletes: akonadi-runtime < %{version}