From 3845bc69ad8e7de3915f58a544d9a13530824a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 27 Apr 2015 15:04:52 +0200 Subject: [PATCH 01/45] Rebuild for boost --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 5704924..4a28d93 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 12%{?dist} +Release: 13%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -234,6 +234,9 @@ fi %changelog +* Mon Apr 27 2015 Daniel Vrátil - 1.13.0-13 +- Rebuild for boost + * Sun Mar 08 2015 Rex Dieter - 1.13.0-12 - explicit BuildRequires: mariadb-server - -mysql: Recommends: mariadb-server (f21+, #1199797) From bc3af2d35c7ff0351d7ab1b09acc139c274ce969 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 7 May 2015 13:47:35 -0500 Subject: [PATCH 02/45] %build: explicitly set -DCMAKE_BUILD_TYPE="Release" (-DQT_NO_DEBUG was used already) --- akonadi.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/akonadi.spec b/akonadi.spec index 4a28d93..f931d85 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 13%{?dist} +Release: 14%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -129,14 +129,14 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} -%{cmake} \ +%{cmake} .. \ + -DCMAKE_BUILD_TYPE:STRING="Release" \ -DCONFIG_INSTALL_DIR=%{_sysconfdir} \ %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \ -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \ - -DWITH_SOPRANO:BOOL=%{?soprano:ON}%{!?soprano:OFF} \ - .. + -DWITH_SOPRANO:BOOL=%{?soprano:ON}%{!?soprano:OFF} popd make %{?_smp_mflags} -C %{_target_platform} @@ -234,6 +234,9 @@ fi %changelog +* Thu May 07 2015 Rex Dieter 1.13.0-14 +- %%build: explicitly set -DCMAKE_BUILD_TYPE="Release" (-DQT_NO_DEBUG was used already) + * Mon Apr 27 2015 Daniel Vrátil - 1.13.0-13 - Rebuild for boost From 8942b654a72d710ee3346a47543e3a7441324cb1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:44:25 +0000 Subject: [PATCH 03/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index f931d85..06b50fe 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -234,6 +234,9 @@ fi %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 1.13.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu May 07 2015 Rex Dieter 1.13.0-14 - %%build: explicitly set -DCMAKE_BUILD_TYPE="Release" (-DQT_NO_DEBUG was used already) From 62a3cba7d77670388fc66bcbc5535eb219186bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 29 Jun 2015 23:03:19 +0200 Subject: [PATCH 04/45] Pull upstream fix for KDE#341884 --- 0031-Don-t-leak-external-payload-files.patch | 134 +++++++++++++++++++ akonadi.spec | 6 +- 2 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 0031-Don-t-leak-external-payload-files.patch diff --git a/0031-Don-t-leak-external-payload-files.patch b/0031-Don-t-leak-external-payload-files.patch new file mode 100644 index 0000000..e62fea7 --- /dev/null +++ b/0031-Don-t-leak-external-payload-files.patch @@ -0,0 +1,134 @@ +commit 9c0dc6b3f0826d32eac310b2e7ecd858ca3df681 +Author: Dan Vrátil +Date: Mon Jun 29 22:45:11 2015 +0200 + + Don't leak old external payload files + + Actually delete old payload files after we increase the payload revision or + switch from external to internal payload. This caused ~/.local/share/akonadi/file_db_data + to grow insanely for all users, leaving them with many duplicated files (just with + different revisions). + + It is recommended that users run akonadictl fsck to clean up the leaked payload + files. + + Note that there won't be any more releases of Akonadi 1.13 (and this has been + fixed in master already), so I strongly recommend distributions to pick this + patch into their packaging. + + BUG: 341884 + CCBUG: 338402 + +diff --git a/server/src/storage/partstreamer.cpp b/server/src/storage/partstreamer.cpp +index 2ec41fa..71bdca8 100644 +--- a/server/src/storage/partstreamer.cpp ++++ b/server/src/storage/partstreamer.cpp +@@ -290,6 +290,12 @@ bool PartStreamer::stream(const QByteArray &command, bool checkExists, + mDataChanged = true; + } + ++ // If the part is external, remember it's current file name ++ QString originalFile; ++ if (part.isValid() && part.external()) { ++ originalFile = PartHelper::resolveAbsolutePath(part.data()); ++ } ++ + part.setPartType(partType); + part.setVersion(partVersion); + part.setPimItemId(mItem.id()); +@@ -306,6 +312,14 @@ bool PartStreamer::stream(const QByteArray &command, bool checkExists, + *changed = mDataChanged; + } + ++ if (!originalFile.isEmpty()) { ++ // If the part was external but is not anymore, or if it's still external ++ // but the filename has changed (revision update), remove the original file ++ if (!part.external() || (part.external() && originalFile != PartHelper::resolveAbsolutePath(part.data()))) { ++ PartHelper::removeFile(originalFile); ++ } ++ } ++ + return ok; + } + +diff --git a/server/tests/unittest/partstreamertest.cpp b/server/tests/unittest/partstreamertest.cpp +index 05e3a8a..669bbbc 100644 +--- a/server/tests/unittest/partstreamertest.cpp ++++ b/server/tests/unittest/partstreamertest.cpp +@@ -91,6 +91,7 @@ private Q_SLOTS: + QTest::addColumn("expectedPartSize"); + QTest::addColumn("expectedChanged"); + QTest::addColumn("isExternal"); ++ QTest::addColumn("version"); + QTest::addColumn("pimItem"); + + PimItem item; +@@ -101,22 +102,22 @@ private Q_SLOTS: + QVERIFY(item.insert()); + + // Order of these tests matters! +- QTest::newRow("item 1, internal") << QByteArray("PLD:DATA") << QByteArray("123") << 3ll << true << false << item; +- QTest::newRow("item 1, change to external") << QByteArray("PLD:DATA") << QByteArray("123456789") << 9ll << true << true << item; +- QTest::newRow("item 1, update external") << QByteArray("PLD:DATA") << QByteArray("987654321") << 9ll << true << true << item; +- QTest::newRow("item 1, external, no change") << QByteArray("PLD:DATA") << QByteArray("987654321") << 9ll << false << true << item; +- QTest::newRow("item 1, change to internal") << QByteArray("PLD:DATA") << QByteArray("1234") << 4ll << true << false << item; +- QTest::newRow("item 1, internal, no change") << QByteArray("PLD:DATA") << QByteArray("1234") << 4ll << false << false << item; ++ QTest::newRow("item 1, internal") << QByteArray("PLD:DATA") << QByteArray("123") << 3ll << true << false << -1 << item; ++ QTest::newRow("item 1, change to external") << QByteArray("PLD:DATA") << QByteArray("123456789") << 9ll << true << true << 0 << item; ++ QTest::newRow("item 1, update external") << QByteArray("PLD:DATA") << QByteArray("987654321") << 9ll << true << true << 1 << item; ++ QTest::newRow("item 1, external, no change") << QByteArray("PLD:DATA") << QByteArray("987654321") << 9ll << false << true << 2 << item; ++ QTest::newRow("item 1, change to internal") << QByteArray("PLD:DATA") << QByteArray("1234") << 4ll << true << false << 2 << item; ++ QTest::newRow("item 1, internal, no change") << QByteArray("PLD:DATA") << QByteArray("1234") << 4ll << false << false << 2 << item; + } + + void testStreamer() + { +- return; + QFETCH(QByteArray, expectedPartName); + QFETCH(QByteArray, expectedData); + QFETCH(qint64, expectedPartSize); + QFETCH(bool, expectedChanged); + QFETCH(bool, isExternal); ++ QFETCH(int, version); + QFETCH(PimItem, pimItem); + + FakeConnection connection; +@@ -160,17 +161,18 @@ private Q_SLOTS: + + PimItem item = PimItem::retrieveById(pimItem.id()); + const QVector parts = item.parts(); +- QVERIFY(parts.count() == 1); ++ QCOMPARE(parts.count(), 1); + const Part part = parts[0]; + QCOMPARE(part.datasize(), expectedPartSize); + QCOMPARE(part.external(), isExternal); ++ qDebug() << part.version() << part.data(); + const QByteArray data = part.data(); + if (isExternal) { + QVERIFY(streamerSpy.count() == 1); + QVERIFY(streamerSpy.first().count() == 1); + const Response response = streamerSpy.first().first().value(); + const QByteArray str = response.asString(); +- const QByteArray expectedResponse = "+ STREAM [FILE " + QByteArray::number(part.id()) + "_r" + QByteArray::number(part.version()) + "]"; ++ const QByteArray expectedResponse = "+ STREAM [FILE " + QByteArray::number(part.id()) + "_r" + QByteArray::number(version) + "]"; + QCOMPARE(QString::fromUtf8(str), QString::fromUtf8(expectedResponse)); + + QFile file(PartHelper::resolveAbsolutePath(data)); +@@ -182,7 +184,7 @@ private Q_SLOTS: + QCOMPARE(fileData, expectedData); + + // Make sure no previous versions are left behind in file_db_data +- for (int i = 0; i < part.version(); ++i) { ++ for (int i = 0; i < version; ++i) { + const QByteArray fileName = QByteArray::number(part.id()) + "_r" + QByteArray::number(part.version()); + const QString filePath = PartHelper::resolveAbsolutePath(fileName); + QVERIFY(!QFile::exists(filePath)); +@@ -194,7 +196,7 @@ private Q_SLOTS: + QCOMPARE(data, expectedData); + + // Make sure nothing is left behind in file_db_data +- for (int i = 0; i <= part.version(); ++i) { ++ for (int i = 0; i <= version; ++i) { + const QByteArray fileName = QByteArray::number(part.id()) + "_r" + QByteArray::number(part.version()); + const QString filePath = PartHelper::resolveAbsolutePath(fileName); + QVERIFY(!QFile::exists(filePath)); diff --git a/akonadi.spec b/akonadi.spec index 06b50fe..0db6a21 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 15%{?dist} +Release: 16%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -68,6 +68,7 @@ Patch27: 0027-Minor-improvements-in-StatisticsCache-as-suggested-b.patch Patch28: 0028-Extend-imapparser-benchmark-and-keep-static-data-aro.patch Patch29: 0029-Reduce-the-amount-of-allocations-by-preallocating-a-.patch Patch30: 0030-Preallocate-a-capacity-of-16-for-the-returned-list.patch +Patch31: 0031-Don-t-leak-external-payload-files.patch %define mysql_conf_timestamp 20140709 @@ -234,6 +235,9 @@ fi %changelog +* Mon Jun 29 2015 Daniel Vrátil - 1.13.0-16 +- pull upstream fix for KDE#341884 + * Tue Jun 16 2015 Fedora Release Engineering - 1.13.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From eb7406d9324ef8c7b173df8cab1ab635139fec5e Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 18:03:59 +0200 Subject: [PATCH 05/45] rebuild for Boost 1.58 --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 0db6a21..a7d3478 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 16%{?dist} +Release: 17%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -235,6 +235,9 @@ fi %changelog +* Wed Jul 22 2015 David Tardon - 1.13.0-17 +- rebuild for Boost 1.58 + * Mon Jun 29 2015 Daniel Vrátil - 1.13.0-16 - pull upstream fix for KDE#341884 From 6505b31d4490f56c48b03d44c6f26858cb4c98bc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 11:57:10 -0500 Subject: [PATCH 06/45] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index a7d3478..cc275ac 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 17%{?dist} +Release: 18%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -235,6 +235,9 @@ fi %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 1.13.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Wed Jul 22 2015 David Tardon - 1.13.0-17 - rebuild for Boost 1.58 From 8b4426d5d343a4ca3df1fd0baa934c1bddb408f3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 2 Aug 2015 13:38:23 -0500 Subject: [PATCH 07/45] pull in latest 1.13 branch fixes --- 0031-Less-C-11-fixes-build-with-clang.patch | 52 ++++++++++++++++ ...ption-when-MOVE-handler-finds-no-ite.patch | 60 +++++++++++++++++++ ...on-t-leak-old-external-payload-files.patch | 44 ++++++++------ ...q-to-match-kdelibs4-and-enable-newer.patch | 25 ++++++++ akonadi.spec | 12 +++- 5 files changed, 171 insertions(+), 22 deletions(-) create mode 100644 0031-Less-C-11-fixes-build-with-clang.patch create mode 100644 0032-Don-t-throw-exception-when-MOVE-handler-finds-no-ite.patch rename 0031-Don-t-leak-external-payload-files.patch => 0033-Don-t-leak-old-external-payload-files.patch (85%) create mode 100644 0034-set-cmake_min_req-to-match-kdelibs4-and-enable-newer.patch diff --git a/0031-Less-C-11-fixes-build-with-clang.patch b/0031-Less-C-11-fixes-build-with-clang.patch new file mode 100644 index 0000000..f915ce2 --- /dev/null +++ b/0031-Less-C-11-fixes-build-with-clang.patch @@ -0,0 +1,52 @@ +From c23607679fa1451f0c6890bd4a5656c07d519853 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Vr=C3=A1til?= +Date: Fri, 6 Feb 2015 13:33:50 +0100 +Subject: [PATCH 31/34] Less C++11, fixes build with clang + +--- + server/tests/unittest/searchtest.cpp | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/server/tests/unittest/searchtest.cpp b/server/tests/unittest/searchtest.cpp +index f523b09..969d296 100644 +--- a/server/tests/unittest/searchtest.cpp ++++ b/server/tests/unittest/searchtest.cpp +@@ -119,21 +119,21 @@ private Q_SLOTS: + QTest::addColumn("mimetypes"); + QTest::addColumn>("expectedResults"); + +- QTest::newRow("") << QVector({ 0 }) +- << QStringList({ QLatin1String("text/plain") }) +- << QVector({ col4.id(), col5.id(), col7.id() }); +- QTest::newRow("") << QVector({ 0 }) +- << QStringList({ QLatin1String("application/octet-stream") }) +- << QVector({ col2.id(), col3.id(), col6.id(), col8.id() }); +- QTest::newRow("") << QVector({ col1.id() }) +- << QStringList({ QLatin1String("text/plain") }) +- << QVector({ col4.id() }); +- QTest::newRow("") << QVector({ col1.id() }) +- << QStringList({ QLatin1String("unique/mime-type") }) ++ QTest::newRow("") << (QVector() << 0) ++ << (QStringList() << QLatin1String("text/plain")) ++ << (QVector() << col4.id() << col5.id() << col7.id()); ++ QTest::newRow("") << (QVector() << 0) ++ << (QStringList() << QLatin1String("application/octet-stream")) ++ << (QVector() << col2.id() << col3.id() << col6.id() << col8.id()); ++ QTest::newRow("") << (QVector() << col1.id()) ++ << (QStringList() << QLatin1String("text/plain")) ++ << (QVector() << col4.id()); ++ QTest::newRow("") << (QVector() << col1.id()) ++ << (QStringList() << QLatin1String("unique/mime-type")) + << QVector(); +- QTest::newRow("") << QVector({ col2.id(), col7.id() }) +- << QStringList({ QLatin1String("application/octet-stream") }) +- << QVector({ col3.id(), col8.id() }); ++ QTest::newRow("") << (QVector() << col2.id() << col7.id()) ++ << (QStringList() << QLatin1String("application/octet-stream")) ++ << (QVector() << col3.id() << col8.id()); + } + + void testSearchHelperCollectionListing() +-- +2.4.3 + diff --git a/0032-Don-t-throw-exception-when-MOVE-handler-finds-no-ite.patch b/0032-Don-t-throw-exception-when-MOVE-handler-finds-no-ite.patch new file mode 100644 index 0000000..62a7637 --- /dev/null +++ b/0032-Don-t-throw-exception-when-MOVE-handler-finds-no-ite.patch @@ -0,0 +1,60 @@ +From abe71f46c3b2e657db25ac16c43a4c76b2212a9f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Vr=C3=A1til?= +Date: Wed, 17 Jun 2015 13:04:13 +0200 +Subject: [PATCH 32/34] Don't throw exception when MOVE handler finds no items + to move + +Instead return "OK MOVE complete" right away. The reason for this is that +when client tries to move an Item from a folder into the same folder (it's +possible in KMail, also mailfilter agent might trigger this situation) the +subsequent command gets eaten by ImapStreamParser and the client's Job gets +stuck waiting for response forever. According to Laurent this could also fix +the Mail Filter Agent getting stuck occasionally. + +The problem is in ImapStreamParser::atCommandEnd() method, which is called +by the Move handler at some point. atCommandEnd() checks whether we reached +command end in the stream by looking if the next characters in the stream +are "\r\n" and if so it will consume the command end ("\r\n"), effectively +moving the streaming position BEYOND the command. In case of MOVE the +command has already been completely parsed so we are actually at the end of +the command and so ImapStreamParser will consume the "\r\n" and position the +stream beyond the command end. + +After that the Move handler tries to get the items from DB and throws the +exception (the second part of the condition in the SQL query causes that +the query yields no results in this situation) which gets us back to +Connection where we then call ImapStreamParser::skipCommand(). At this point +however there are no more data in the stream (because atCommandEnd() moved +us beyond the end of the MOVE command) and so ImapStreamParser will block +and wait for more data (with 30 seconds timeout). If client sends another +command within this time the ImapStreamParser will think that this is the +command to be skipped and will consume it. This means that the command never +really reaches the Connection as it's consumed as soon as it's captured by +ImapStreamParser. And because Akonadi never receives the command it cannot +send a response and thus the Job in client will wait forever and ever... + +Proper fix would be to make ImapStreamParser::atCommandEnd() to only peek +instead of actually altering the position in the stream however I'm really +afraid that it could break some other stuff that relies on this (broken?) +behaviour and our test coverage is not sufficient at this point to be +reliable enough. +--- + server/src/handler/move.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/src/handler/move.cpp b/server/src/handler/move.cpp +index 0a6c3bf..4cf9d4e 100644 +--- a/server/src/handler/move.cpp ++++ b/server/src/handler/move.cpp +@@ -85,7 +85,7 @@ bool Move::parseStream() + if ( qb.exec() ) { + const QVector items = qb.result(); + if ( items.isEmpty() ) { +- throw HandlerException( "No items found" ); ++ return successResponse( "MOVE complete" ); + } + + // Split the list by source collection +-- +2.4.3 + diff --git a/0031-Don-t-leak-external-payload-files.patch b/0033-Don-t-leak-old-external-payload-files.patch similarity index 85% rename from 0031-Don-t-leak-external-payload-files.patch rename to 0033-Don-t-leak-old-external-payload-files.patch index e62fea7..2325de0 100644 --- a/0031-Don-t-leak-external-payload-files.patch +++ b/0033-Don-t-leak-old-external-payload-files.patch @@ -1,23 +1,26 @@ -commit 9c0dc6b3f0826d32eac310b2e7ecd858ca3df681 -Author: Dan Vrátil -Date: Mon Jun 29 22:45:11 2015 +0200 +From 9c0dc6b3f0826d32eac310b2e7ecd858ca3df681 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Vr=C3=A1til?= +Date: Mon, 29 Jun 2015 22:45:11 +0200 +Subject: [PATCH 33/34] Don't leak old external payload files - Don't leak old external payload files - - Actually delete old payload files after we increase the payload revision or - switch from external to internal payload. This caused ~/.local/share/akonadi/file_db_data - to grow insanely for all users, leaving them with many duplicated files (just with - different revisions). - - It is recommended that users run akonadictl fsck to clean up the leaked payload - files. - - Note that there won't be any more releases of Akonadi 1.13 (and this has been - fixed in master already), so I strongly recommend distributions to pick this - patch into their packaging. - - BUG: 341884 - CCBUG: 338402 +Actually delete old payload files after we increase the payload revision or +switch from external to internal payload. This caused ~/.local/share/akonadi/file_db_data +to grow insanely for all users, leaving them with many duplicated files (just with +different revisions). + +It is recommended that users run akonadictl fsck to clean up the leaked payload +files. + +Note that there won't be any more releases of Akonadi 1.13 (and this has been +fixed in master already), so I strongly recommend distributions to pick this +patch into their packaging. + +BUG: 341884 +CCBUG: 338402 +--- + server/src/storage/partstreamer.cpp | 14 ++++++++++++++ + server/tests/unittest/partstreamertest.cpp | 24 +++++++++++++----------- + 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/server/src/storage/partstreamer.cpp b/server/src/storage/partstreamer.cpp index 2ec41fa..71bdca8 100644 @@ -132,3 +135,6 @@ index 05e3a8a..669bbbc 100644 const QByteArray fileName = QByteArray::number(part.id()) + "_r" + QByteArray::number(part.version()); const QString filePath = PartHelper::resolveAbsolutePath(fileName); QVERIFY(!QFile::exists(filePath)); +-- +2.4.3 + diff --git a/0034-set-cmake_min_req-to-match-kdelibs4-and-enable-newer.patch b/0034-set-cmake_min_req-to-match-kdelibs4-and-enable-newer.patch new file mode 100644 index 0000000..9d6411f --- /dev/null +++ b/0034-set-cmake_min_req-to-match-kdelibs4-and-enable-newer.patch @@ -0,0 +1,25 @@ +From 18ed37d89b8185ac15a8bfe245de8a88d17f2c64 Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 28 Jul 2015 12:47:44 +0200 +Subject: [PATCH 34/34] set cmake_min_req to match kdelibs4 and enable newer + policies + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2d790c9..a64e724 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ ++cmake_minimum_required(VERSION 2.8.9) + project(Akonadi) + +-cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) + + # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked + set(CMAKE_MODULE_PATH "${Akonadi_SOURCE_DIR}/cmake/modules") +-- +2.4.3 + diff --git a/akonadi.spec b/akonadi.spec index cc275ac..11760eb 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 18%{?dist} +Release: 19%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -37,7 +37,7 @@ Source10: akonadiserverrc.mysql ## upstreamable patches -## upstream patches +## upstream patches (1.13 branch) Patch1: 0001-FindSqlite-Use-CMAKE_FLAGS-the-right-way-in-try_comp.patch Patch2: 0002-Do-not-enter-the-test-directories-if-AKONADI_BUILD_T.patch Patch3: 0003-STORE-Allow-modifying-items-tags-via-Tag-RID-or-GID.patch @@ -68,7 +68,10 @@ Patch27: 0027-Minor-improvements-in-StatisticsCache-as-suggested-b.patch Patch28: 0028-Extend-imapparser-benchmark-and-keep-static-data-aro.patch Patch29: 0029-Reduce-the-amount-of-allocations-by-preallocating-a-.patch Patch30: 0030-Preallocate-a-capacity-of-16-for-the-returned-list.patch -Patch31: 0031-Don-t-leak-external-payload-files.patch +Patch31: 0031-Less-C-11-fixes-build-with-clang.patch +Patch32: 0032-Don-t-throw-exception-when-MOVE-handler-finds-no-ite.patch +Patch33: 0033-Don-t-leak-old-external-payload-files.patch +Patch34: 0034-set-cmake_min_req-to-match-kdelibs4-and-enable-newer.patch %define mysql_conf_timestamp 20140709 @@ -235,6 +238,9 @@ fi %changelog +* Fri Jul 31 2015 Rex Dieter 1.13.0-19 +- pull in latest 1.13 branch fixes + * Wed Jul 29 2015 Fedora Release Engineering - 1.13.0-18 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From 258eaca3ec4b59c716c94a278e389bd81c680481 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 5 Aug 2015 19:35:04 +0100 Subject: [PATCH 08/45] Rebuilt for Boost 1.58 --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 11760eb..b17b48c 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 19%{?dist} +Release: 20%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -238,6 +238,9 @@ fi %changelog +* Wed Aug 05 2015 Jonathan Wakely 1.13.0-20 +- Rebuilt for Boost 1.58 + * Fri Jul 31 2015 Rex Dieter 1.13.0-19 - pull in latest 1.13 branch fixes From 36b47e46bece0006d7b11ac85463aed17851d5fe Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 20 Aug 2015 22:28:40 +0200 Subject: [PATCH 09/45] 15.08.0 --- .gitignore | 1 + akonadi.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d95e0b8..0eca4e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /akonadi-1.13.0.tar.bz2 +/akonadi-15.08.0.tar.xz diff --git a/akonadi.spec b/akonadi.spec index b17b48c..0b08f74 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -18,8 +18,8 @@ Summary: PIM Storage Service Name: akonadi -Version: 1.13.0 -Release: 20%{?dist} +Version: 15.08.0 +Release: 1%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -238,6 +238,9 @@ fi %changelog +* Thu Aug 20 2015 Than Ngo - 15.08.0-1 +- 15.08.0 + * Wed Aug 05 2015 Jonathan Wakely 1.13.0-20 - Rebuilt for Boost 1.58 diff --git a/sources b/sources index 4957149..0bdc4f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84eb2e471bd6bdfe54a2a2f1d858c07d akonadi-1.13.0.tar.bz2 +e6d025189fc54594c84ca52f2a478b62 akonadi-15.08.0.tar.xz From 7e082edf724bd7486e3043bec5adffe8e9b79afb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 30 Aug 2015 11:30:12 -0500 Subject: [PATCH 10/45] Revert "15.08.0" This reverts commit 36b47e46bece0006d7b11ac85463aed17851d5fe. moving to qt5 pim stack will be a lot more work, not ready till at least sometime next week. --- .gitignore | 1 - akonadi.spec | 7 ++----- sources | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0eca4e7..d95e0b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /akonadi-1.13.0.tar.bz2 -/akonadi-15.08.0.tar.xz diff --git a/akonadi.spec b/akonadi.spec index 0b08f74..b17b48c 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -18,8 +18,8 @@ Summary: PIM Storage Service Name: akonadi -Version: 15.08.0 -Release: 1%{?dist} +Version: 1.13.0 +Release: 20%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -238,9 +238,6 @@ fi %changelog -* Thu Aug 20 2015 Than Ngo - 15.08.0-1 -- 15.08.0 - * Wed Aug 05 2015 Jonathan Wakely 1.13.0-20 - Rebuilt for Boost 1.58 diff --git a/sources b/sources index 0bdc4f0..4957149 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6d025189fc54594c84ca52f2a478b62 akonadi-15.08.0.tar.xz +84eb2e471bd6bdfe54a2a2f1d858c07d akonadi-1.13.0.tar.bz2 From b97ca23711ba24a0fad57fe14f61e87910984a2d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 21:17:20 +0100 Subject: [PATCH 11/45] Rebuilt for Boost 1.59 --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index b17b48c..404740f 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 20%{?dist} +Release: 21%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -238,6 +238,9 @@ fi %changelog +* Sun Aug 30 2015 Jonathan Wakely 1.13.0-21 +- Rebuilt for Boost 1.59 + * Wed Aug 05 2015 Jonathan Wakely 1.13.0-20 - Rebuilt for Boost 1.58 From 21ec943481459517733ef2cb693f934edb494ebb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 12 Nov 2015 10:29:52 -0600 Subject: [PATCH 12/45] Recommends: akonadi-mysql --- akonadi.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 404740f..0e597b8 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -19,7 +19,7 @@ Summary: PIM Storage Service Name: akonadi Version: 1.13.0 -Release: 21%{?dist} +Release: 22%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -97,6 +97,10 @@ BuildRequires: postgresql-server Requires(postun): /sbin/ldconfig +%if 0%{?fedora} > 21 +Recommends: %{name}-mysql = %{version}-%{release} +%endif + %description %{summary}. @@ -238,6 +242,9 @@ fi %changelog +* Thu Nov 12 2015 Rex Dieter 1.13.0-22 +- Recommends: akonadi-mysql + * Sun Aug 30 2015 Jonathan Wakely 1.13.0-21 - Rebuilt for Boost 1.59 From 04ca9f646e051af28fd8079aeab222231e8299aa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Dec 2015 08:38:19 -0600 Subject: [PATCH 13/45] for kf5 kdepim world, build libakonadi bits only (omit server and related files) --- akonadi-1.13.0-libs_only.patch | 33 +++++++ akonadi.spec | 152 +++------------------------------ 2 files changed, 45 insertions(+), 140 deletions(-) create mode 100644 akonadi-1.13.0-libs_only.patch diff --git a/akonadi-1.13.0-libs_only.patch b/akonadi-1.13.0-libs_only.patch new file mode 100644 index 0000000..73da4ca --- /dev/null +++ b/akonadi-1.13.0-libs_only.patch @@ -0,0 +1,33 @@ +diff -up akonadi-1.13.0/CMakeLists.txt.opt akonadi-1.13.0/CMakeLists.txt +--- akonadi-1.13.0/CMakeLists.txt.opt 2015-12-11 07:44:57.653216984 -0600 ++++ akonadi-1.13.0/CMakeLists.txt 2015-12-11 07:52:14.749205933 -0600 +@@ -339,22 +339,22 @@ endif() + + include_directories(${Akonadi_SOURCE_DIR} ${Akonadi_BINARY_DIR} ${QT_INCLUDES} ${Boost_INCLUDE_DIR}) + +-add_subdirectory(interfaces) ++#add_subdirectory(interfaces) + add_subdirectory(libs) + set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternals) + +-add_subdirectory(shared) +-add_subdirectory(agentserver) +-add_subdirectory(server) ++#add_subdirectory(shared) ++#add_subdirectory(agentserver) ++#add_subdirectory(server) + +-add_subdirectory(rds) ++#add_subdirectory(rds) + if(NOT WIN32) +- add_subdirectory(asapcat) ++ #add_subdirectory(asapcat) + endif() + if (NOT QT5_BUILD) + if(SQLITE_FOUND) + option(SQLITE_LINK_STATIC "link libsqlite3 statically" FALSE) +- add_subdirectory(qsqlite) ++ #add_subdirectory(qsqlite) + endif() + endif() + diff --git a/akonadi.spec b/akonadi.spec index 0e597b8..9408bae 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -5,35 +5,17 @@ # trim changelog included in binary rpms %global _changelog_trimtime %(date +%s -d "1 year ago") -# legacy nepomuk/soprano support (ie, kde < 4.13) -%if 0%{?fedora} < 20 -%define soprano 1 -%endif - -%global mysql mysql -%if 0%{?rhel} > 6 -# el7 mariadb pkgs don't have compat Provides: mysql (apparently?) -%global mysql mariadb -%endif - -Summary: PIM Storage Service +Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 22%{?dist} +Release: 100%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi -%if 0%{?snap} -# git clone git://git.kde.org/akonadi -# git archive --prefix=akonadi-%{version}/ master | bzip2 > akonadi-%{version}-%{snap}.tar.bz2 -Source0: akonadi-%{version}-%{snap}.tar.bz2 -%else -# Official release Source0: http://download.kde.org/stable/akonadi/src/akonadi-%{version}.tar.bz2 -%endif -## mysql config -Source10: akonadiserverrc.mysql +## downstream patches +Patch100: akonadi-1.13.0-libs_only.patch ## upstreamable patches @@ -68,12 +50,6 @@ Patch27: 0027-Minor-improvements-in-StatisticsCache-as-suggested-b.patch Patch28: 0028-Extend-imapparser-benchmark-and-keep-static-data-aro.patch Patch29: 0029-Reduce-the-amount-of-allocations-by-preallocating-a-.patch Patch30: 0030-Preallocate-a-capacity-of-16-for-the-returned-list.patch -Patch31: 0031-Less-C-11-fixes-build-with-clang.patch -Patch32: 0032-Don-t-throw-exception-when-MOVE-handler-finds-no-ite.patch -Patch33: 0033-Don-t-leak-old-external-payload-files.patch -Patch34: 0034-set-cmake_min_req-to-match-kdelibs4-and-enable-newer.patch - -%define mysql_conf_timestamp 20140709 BuildRequires: automoc4 BuildRequires: boost-devel @@ -82,24 +58,6 @@ BuildRequires: cmake >= 2.8.8 BuildRequires: libxslt BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) pkgconfig(QtXml) BuildRequires: pkgconfig(shared-mime-info) -%if 0%{?soprano} -BuildRequires: pkgconfig(soprano) -%endif -BuildRequires: pkgconfig(sqlite3) >= 3.6.23 -# %%check -BuildRequires: dbus-x11 xorg-x11-server-Xvfb -# backends, used at buildtime to query known locations of server binaries -# FIXME/TODO: set these via cmake directives, avoids needless buildroot items -BuildRequires: mariadb-server -BuildRequires: postgresql-server - -%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} - -Requires(postun): /sbin/ldconfig - -%if 0%{?fedora} > 21 -Recommends: %{name}-mysql = %{version}-%{release} -%endif %description %{summary}. @@ -110,27 +68,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel %{summary}. -%package mysql -Summary: Akonadi MySQL backend support -# upgrade path -Obsoletes: akonadi < 1.7.90-2 -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{mysql}-server -%if "%{?mysql}" != "mariadb" && 0%{?fedora} > 20 -Recommends: mariadb-server -%endif -Requires: qt4-mysql%{?_isa} -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives -%description mysql -Configures akonadi to use mysql backend by default. - -Requires an available instance of mysql server at runtime. -Akonadi can spawn a per-user one automatically if the mysql-server -package is installed on the machine. -See also: %{_sysconfdir}/akonadi/mysql-global.conf - - %prep %autosetup -p1 -n akonadi-%{version} @@ -140,11 +77,7 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf mkdir %{_target_platform} pushd %{_target_platform} %{cmake} .. \ - -DCMAKE_BUILD_TYPE:STRING="Release" \ - -DCONFIG_INSTALL_DIR=%{_sysconfdir} \ - %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \ - -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \ - -DWITH_SOPRANO:BOOL=%{?soprano:ON}%{!?soprano:OFF} + -DCMAKE_BUILD_TYPE:STRING="Release" popd make %{?_smp_mflags} -C %{_target_platform} @@ -153,95 +86,34 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} -install -p -m644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql - -mkdir -p %{buildroot}%{_datadir}/akonadi/agents - -touch -d %{mysql_conf_timestamp} \ - %{buildroot}%{_sysconfdir}/akonadi/mysql-global*.conf \ - %{buildroot}%{_sysconfdir}/akonadi/mysql-local.conf - -# create/own %{_libdir}/akondi -mkdir -p %{buildroot}%{_libdir}/akonadi - -# %%ghost'd global akonadiserverrc -touch akonadiserverrc -install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc - ## unpackaged files -# omit mysql-global-mobile.conf -rm -fv %{buildroot}%{_sysconfdir}/akonadi/mysql-global-mobile.conf +rm -fv %{buildroot}%{_datadir}/mime/packages/akonadi-mime.xml %check export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig test "$(pkg-config --modversion akonadi)" = "%{version}" -# this one (still) fails in mock (local build ok): -# 14/14 Test #14: akonadi-dbconfigtest -xvfb-run -a dbus-launch --exit-with-session make test -C %{_target_platform} ||: -%post -/sbin/ldconfig -touch --no-create %{_datadir}/mime/packages &> /dev/null || : - -%posttrans -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - -%postun -/sbin/ldconfig ||: -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/mime/packages &> /dev/null || : - update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null ||: -fi +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files %doc AUTHORS lgpl-license -%dir %{_sysconfdir}/xdg/akonadi/ -%ghost %config(missingok,noreplace) %{_sysconfdir}/xdg/akonadi/akonadiserverrc -%dir %{_sysconfdir}/akonadi/ -%{_bindir}/akonadi_agent_launcher -%{_bindir}/akonadi_agent_server -%{_bindir}/akonadi_control -%{_bindir}/akonadi_rds -%{_bindir}/akonadictl -%{_bindir}/akonadiserver -%{_libdir}/akonadi/ +%license lgpl-license %{_libdir}/libakonadiprotocolinternals.so.1* -%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml -%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service -%{_datadir}/mime/packages/akonadi-mime.xml -%{_datadir}/akonadi/ -%{_qt4_plugindir}/sqldrivers/libqsqlite3.so %files devel -%{_bindir}/asapcat %{_includedir}/akonadi/ %{_libdir}/pkgconfig/akonadi.pc %{_libdir}/libakonadiprotocolinternals.so %{_libdir}/cmake/Akonadi/ -%post mysql -%{_sbindir}/update-alternatives \ - --install %{_sysconfdir}/xdg/akonadi/akonadiserverrc \ - akonadiserverrc \ - %{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql \ - 10 - -%postun mysql -if [ $1 -eq 0 ]; then -%{_sbindir}/update-alternatives \ - --remove akonadiserverrc \ - %{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql -fi - -%files mysql -%config(noreplace) %{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql -%config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf -%config(noreplace) %{_sysconfdir}/akonadi/mysql-local.conf - %changelog +* Fri Dec 11 2015 Rex Dieter 1.13.0-100 +- for kf5 kdepim world, build libakonadi bits only (omit server and related files) + * Thu Nov 12 2015 Rex Dieter 1.13.0-22 - Recommends: akonadi-mysql From 80bf6d98ef25288058618e07429fe5d3be56955a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 17 Dec 2015 13:45:30 -0600 Subject: [PATCH 14/45] devel: re-enable dbus-1/interfaces, Conflicts: kf5-akonadi-server-devel --- akonadi-1.13.0-libs_only.patch | 2 +- akonadi.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/akonadi-1.13.0-libs_only.patch b/akonadi-1.13.0-libs_only.patch index 73da4ca..96f48cd 100644 --- a/akonadi-1.13.0-libs_only.patch +++ b/akonadi-1.13.0-libs_only.patch @@ -6,7 +6,7 @@ diff -up akonadi-1.13.0/CMakeLists.txt.opt akonadi-1.13.0/CMakeLists.txt include_directories(${Akonadi_SOURCE_DIR} ${Akonadi_BINARY_DIR} ${QT_INCLUDES} ${Boost_INCLUDE_DIR}) -add_subdirectory(interfaces) -+#add_subdirectory(interfaces) ++add_subdirectory(interfaces) add_subdirectory(libs) set(AKONADI_PROTOCOLINTERNALS_LIBS ${akonadiprotocolinternals_LIB_DEPENDS} akonadiprotocolinternals) diff --git a/akonadi.spec b/akonadi.spec index 9408bae..7ebe0a5 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 100%{?dist} +Release: 101%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -64,6 +64,7 @@ BuildRequires: pkgconfig(shared-mime-info) %package devel Summary: Developer files for %{name} +Conflicts: kf5-akonadi-server-devel Requires: %{name}%{?_isa} = %{version}-%{release} %description devel %{summary}. @@ -108,9 +109,13 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %{_libdir}/pkgconfig/akonadi.pc %{_libdir}/libakonadiprotocolinternals.so %{_libdir}/cmake/Akonadi/ +%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml %changelog +* Thu Dec 17 2015 Rex Dieter 1.13.0-101 +- -devel: re-enable dbus-1/interfaces, Conflicts: kf5-akonadi-server-devel + * Fri Dec 11 2015 Rex Dieter 1.13.0-100 - for kf5 kdepim world, build libakonadi bits only (omit server and related files) From 2981736d0263f66ecd211c92b9d5c790f08b5f30 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:04:06 +0000 Subject: [PATCH 15/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 7ebe0a5..0d179fa 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 101%{?dist} +Release: 102%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.13.0-102 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Dec 17 2015 Rex Dieter 1.13.0-101 - -devel: re-enable dbus-1/interfaces, Conflicts: kf5-akonadi-server-devel From cba6ce5ec119728df38e76968c4fe1e118bf3296 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:50:28 +0000 Subject: [PATCH 16/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 0d179fa..eb05055 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 102%{?dist} +Release: 103%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.13.0-103 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 1.13.0-102 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 13aaf3464f08dc5484728848af60dfdc09224c1f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 18 Jul 2017 12:13:23 +0100 Subject: [PATCH 17/45] Rebuilt for Boost 1.64 --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index eb05055..5f4e542 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 103%{?dist} +Release: 104%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Tue Jul 18 2017 Jonathan Wakely - 1.13.0-104 +- Rebuilt for Boost 1.64 + * Fri Feb 10 2017 Fedora Release Engineering - 1.13.0-103 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b8f85d80a12f2f501283dd2eb6a8e7b91781461b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:42:05 +0000 Subject: [PATCH 18/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 5f4e542..256955c 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 104%{?dist} +Release: 105%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.13.0-105 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jul 18 2017 Jonathan Wakely - 1.13.0-104 - Rebuilt for Boost 1.64 From 80b6168b8d18acdff37d9883c04a109a71f1d732 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:28:23 +0000 Subject: [PATCH 19/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 256955c..0ea3ae6 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 105%{?dist} +Release: 106%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.13.0-106 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.13.0-105 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 99916b63be63faa85a07886010532eb03fa149bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Aug 2017 11:28:59 +0200 Subject: [PATCH 20/45] Rebuilt for AutoReq cmake-filesystem --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 0ea3ae6..46a6d20 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 106%{?dist} +Release: 107%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Sun Aug 06 2017 Björn Esser - 1.13.0-107 +- Rebuilt for AutoReq cmake-filesystem + * Wed Aug 02 2017 Fedora Release Engineering - 1.13.0-106 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From e0386f5e78a2d8341ec3b1a10ef5d75f9ce9a5df Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 23 Jan 2018 12:01:43 +0000 Subject: [PATCH 21/45] Rebuilt for Boost 1.66 --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 46a6d20..126fa2a 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 107%{?dist} +Release: 108%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Tue Jan 23 2018 Jonathan Wakely - 1.13.0-108 +- Rebuilt for Boost 1.66 + * Sun Aug 06 2017 Björn Esser - 1.13.0-107 - Rebuilt for AutoReq cmake-filesystem From 070820a23d2d0392b3824df71c4169e5431c0dae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:02:35 +0000 Subject: [PATCH 22/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 126fa2a..019909b 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 108%{?dist} +Release: 109%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.13.0-109 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 23 2018 Jonathan Wakely - 1.13.0-108 - Rebuilt for Boost 1.66 From c183a6e34552f72fd4d4c5265a7e6b95e1059c84 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Feb 2018 15:47:13 -0600 Subject: [PATCH 23/45] BR: gcc-c++, use %ldconfig_scriptlets --- akonadi.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/akonadi.spec b/akonadi.spec index 019909b..e789158 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 109%{?dist} +Release: 110%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -54,6 +54,7 @@ Patch30: 0030-Preallocate-a-capacity-of-16-for-the-returned-list.patch BuildRequires: automoc4 BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 +BuildRequires: gcc-c++ # for xsltproc BuildRequires: libxslt BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql) pkgconfig(QtXml) @@ -96,11 +97,10 @@ export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/ test "$(pkg-config --modversion akonadi)" = "%{version}" -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%doc AUTHORS lgpl-license +%doc AUTHORS %license lgpl-license %{_libdir}/libakonadiprotocolinternals.so.1* @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Tue Feb 20 2018 Rex Dieter - 1.13.0-110 +- BR: gcc-c++, use %%ldconfig_scriptlets + * Wed Feb 07 2018 Fedora Release Engineering - 1.13.0-109 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 442c71f0ec47b0d295706bfbe483d913a0cfa99d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:05:38 +0000 Subject: [PATCH 24/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index e789158..7f807d3 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 110%{?dist} +Release: 111%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.13.0-111 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Feb 20 2018 Rex Dieter - 1.13.0-110 - BR: gcc-c++, use %%ldconfig_scriptlets From e63e99f1ef9ca0fabc57efc93447612234e2f99f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 25 Jan 2019 08:13:03 +0000 Subject: [PATCH 25/45] Rebuilt for Boost 1.69 --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 7f807d3..8bc283f 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 111%{?dist} +Release: 112%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Fri Jan 25 2019 Jonathan Wakely - 1.13.0-112 +- Rebuilt for Boost 1.69 + * Thu Jul 12 2018 Fedora Release Engineering - 1.13.0-111 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5f516d08a433f182c0d215b6c514e94f5ec763f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:07:51 +0000 Subject: [PATCH 26/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 8bc283f..04deed4 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 112%{?dist} +Release: 113%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.13.0-113 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jan 25 2019 Jonathan Wakely - 1.13.0-112 - Rebuilt for Boost 1.69 From 5a7644bcb23f2f6aa3b25f108177d139d22c8a6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:42:27 +0000 Subject: [PATCH 27/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 04deed4..d1da2cb 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 113%{?dist} +Release: 114%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.13.0-114 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.13.0-113 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d4cb7121285ecb5a38c75de9dfa3aa1fe19d4ac7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:21:56 +0000 Subject: [PATCH 28/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index d1da2cb..5510807 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -8,7 +8,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 114%{?dist} +Release: 115%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -113,6 +113,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.13.0-115 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.13.0-114 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 71184c15cba18fff766016906b091ca622bd0377 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 5 Jul 2020 14:46:26 -0400 Subject: [PATCH 29/45] Update to new out-of-source build mechanism --- akonadi.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/akonadi.spec b/akonadi.spec index 5510807..317756e 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -1,3 +1,5 @@ +# Force out of source build +%undefine __cmake_in_source_build # base pkg default to SQLITE now, install -mysql if you want that instead %global database_backend SQLITE @@ -76,17 +78,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake} .. \ - -DCMAKE_BUILD_TYPE:STRING="Release" -popd - -make %{?_smp_mflags} -C %{_target_platform} +%cmake -DCMAKE_BUILD_TYPE:STRING="Release" +%cmake_build %install -make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} +%cmake_install ## unpackaged files rm -fv %{buildroot}%{_datadir}/mime/packages/akonadi-mime.xml From b53992e7f46241bde8cfc4e6e3accfa41039fd0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:52:34 +0000 Subject: [PATCH 30/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 317756e..4012d2a 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 115%{?dist} +Release: 116%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.13.0-116 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.13.0-115 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e0c683030d8f8687f2f61749be4df85a3d825903 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:53:20 +0000 Subject: [PATCH 31/45] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 4012d2a..95a5d90 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 116%{?dist} +Release: 117%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,10 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 1.13.0-117 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.13.0-116 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1d79ef60cff02fd007dd51be398d5392ae1f6a0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:56:12 +0000 Subject: [PATCH 32/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 95a5d90..065ee0e 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 117%{?dist} +Release: 118%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 1.13.0-118 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 1.13.0-117 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1c611726ac91c60466f96ddc5e456fcd47baab38 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:28:20 +0000 Subject: [PATCH 33/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e513ef09a921c9b584d88592dde653faf9790375 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:23:36 +0000 Subject: [PATCH 34/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 065ee0e..a63bcd2 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 118%{?dist} +Release: 119%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.13.0-119 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 1.13.0-118 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 24bd5578bf448a9ba65dee8e70909394a8a38d14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:04:02 +0000 Subject: [PATCH 35/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index a63bcd2..ab84ad3 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 119%{?dist} +Release: 120%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.13.0-120 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.13.0-119 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From bad5a7962ce1a802e3288b8a7c946301b57e4010 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:35:13 +0000 Subject: [PATCH 36/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index ab84ad3..e3f2eb2 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 120%{?dist} +Release: 121%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.13.0-121 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.13.0-120 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3e10cdbabedc3116e881d6932d85bdd694a61c2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:32:30 +0000 Subject: [PATCH 37/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index e3f2eb2..c225638 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 121%{?dist} +Release: 122%{?dist} License: LGPLv2+ URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.13.0-122 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.13.0-121 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8e0da1155dc1bf1eef87ac21e567f12cef57e4c5 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 12 Jun 2023 12:12:13 +0200 Subject: [PATCH 38/45] migrated to SPDX license --- akonadi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/akonadi.spec b/akonadi.spec index c225638..44b0477 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,9 +10,9 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 122%{?dist} +Release: 123%{?dist} -License: LGPLv2+ +License: LGPL-2.0-or-later URL: http://community.kde.org/KDE_PIM/Akonadi Source0: http://download.kde.org/stable/akonadi/src/akonadi-%{version}.tar.bz2 @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Mon Jun 12 2023 Than Ngo - 1.13.0-123 +- migrated to SPDX license + * Wed Jan 18 2023 Fedora Release Engineering - 1.13.0-122 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From aefd5236d85058d0c5f50ac09884c25c79f99574 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:03:56 +0000 Subject: [PATCH 39/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 44b0477..4cb1f58 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 123%{?dist} +Release: 124%{?dist} License: LGPL-2.0-or-later URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.13.0-124 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 12 2023 Than Ngo - 1.13.0-123 - migrated to SPDX license From 2bcdc9e18b150a85e8d32f00f177e3646aa45c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:29:49 +0000 Subject: [PATCH 40/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 4cb1f58..e6915fe 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 124%{?dist} +Release: 125%{?dist} License: LGPL-2.0-or-later URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.13.0-125 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.13.0-124 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 547cef98b921b2238c917ae87317e88e054cba3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:49:46 +0000 Subject: [PATCH 41/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index e6915fe..48bb7d9 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 125%{?dist} +Release: 126%{?dist} License: LGPL-2.0-or-later URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.13.0-126 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.13.0-125 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b94e5a0e93b21bc80518518816ee68fb871c9bb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:46:09 +0000 Subject: [PATCH 42/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 48bb7d9..bdf118c 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 126%{?dist} +Release: 127%{?dist} License: LGPL-2.0-or-later URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.13.0-127 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.13.0-126 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d5433cf6e85683b6145f35ba3cdc54a782b9b3dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:46:32 +0000 Subject: [PATCH 43/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index bdf118c..0a8daa7 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 127%{?dist} +Release: 128%{?dist} License: LGPL-2.0-or-later URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.13.0-128 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.13.0-127 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 04d7652051e4579f9fa8817654dddec620393c21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:51:21 +0000 Subject: [PATCH 44/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 0a8daa7..79e70d7 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 128%{?dist} +Release: 129%{?dist} License: LGPL-2.0-or-later URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.13.0-129 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.13.0-128 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f93f842792304170af34c29100d24a75b29570db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:32:46 +0000 Subject: [PATCH 45/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- akonadi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akonadi.spec b/akonadi.spec index 79e70d7..e616592 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -10,7 +10,7 @@ Summary: PIM Storage Service Libraries Name: akonadi Version: 1.13.0 -Release: 129%{?dist} +Release: 130%{?dist} License: LGPL-2.0-or-later URL: http://community.kde.org/KDE_PIM/Akonadi @@ -110,6 +110,9 @@ test "$(pkg-config --modversion akonadi)" = "%{version}" %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.13.0-130 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.13.0-129 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild