From cab99147f2e9db5865e741237f9c63464888bf7fd62cc9f22b33545e973199ee Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 21 Nov 2020 12:57:35 +0000 Subject: [PATCH 1/5] 20.12 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=257 --- akonadi-20.08.3.tar.xz | 3 --- akonadi-20.08.3.tar.xz.sig | 11 ----------- akonadi-20.11.80.tar.xz | 3 +++ akonadi-20.11.80.tar.xz.sig | 16 ++++++++++++++++ akonadi-server.changes | 8 ++++++++ akonadi-server.spec | 13 +++++-------- 6 files changed, 32 insertions(+), 22 deletions(-) delete mode 100644 akonadi-20.08.3.tar.xz delete mode 100644 akonadi-20.08.3.tar.xz.sig create mode 100644 akonadi-20.11.80.tar.xz create mode 100644 akonadi-20.11.80.tar.xz.sig diff --git a/akonadi-20.08.3.tar.xz b/akonadi-20.08.3.tar.xz deleted file mode 100644 index 132ecd8..0000000 --- a/akonadi-20.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:144aea34fbc728a4f4d015194593efad0350375cb7dc565db5827b5688558ac3 -size 1591360 diff --git a/akonadi-20.08.3.tar.xz.sig b/akonadi-20.08.3.tar.xz.sig deleted file mode 100644 index c809664..0000000 --- a/akonadi-20.08.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl+gqh8ACgkQ29LOiT4t -HIf0vwf/SyKDyCpHnt7zdsZG7rTPHh6VdFJT37cYOHKthB9M/hOZfiqr0km5yx34 -hOP0d4FHANFW94BULsogqRw8lPp25dAVydep8WRGTMSpDGZUhAZntkeHtvlVJBGO -r8zNJABKlzutI0nfRfAwYUMLwsx/gCNqJz0B1GJonuDp0weGnA8fj8hgTuLEgTMX -IzDds3Es2UOKiu/MaohGmHqWnPRN3L13jodfje3fBxAq12FPguqFVONWs6XCmzRv -/CwckmNVpmprFkl3YvDhwfNj+8SEieuteqJZE/YKwGjHAODqMzUlKJ5plKr5QHA7 -DkKsCbOZGP+xme4j9Tqll0fIAUtYZg== -=pNds ------END PGP SIGNATURE----- diff --git a/akonadi-20.11.80.tar.xz b/akonadi-20.11.80.tar.xz new file mode 100644 index 0000000..b564ded --- /dev/null +++ b/akonadi-20.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05b7fa5cc8f919c0f7b7d2db4747b27e4365348851109d84d51c58ba9df3a45b +size 1592728 diff --git a/akonadi-20.11.80.tar.xz.sig b/akonadi-20.11.80.tar.xz.sig new file mode 100644 index 0000000..bd24b65 --- /dev/null +++ b/akonadi-20.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uoloACgkQOmpNuDnq +ptdxrg//cVzA6ZFxovd6hoCy8OjdIpTPmzKBjFCWfCDZXDop2XcNKlozJpDolDNy +4CmqWACSzAu3K3G1PNm9270jf1QRI0VNf5jHUAgPxeK6px5WWyDTw/8k45K9MkZZ +X6J0z6LoukPU9QHvufw2MS09Fb7L8LHW1z9uTvA9neZvElQUq5FX9FwJyxHfpzbI +3e0XYpAuNCt8x6DM3BVH7HXrYx1h/q/dfIWP8M6xxjxchnR1IuOQZLBrckgbzqy9 +Y6kTuzK8u3j/QSf+U9EVIVKCOyC58VnRow9OMo4eRQn0IAjRinA2HfrzYdQnREcT +Rwb6bxa072Vb1tJEOGz+WTAndZFpQOi5VH6AwFBO2EO4RFarwFerFNGl2S3+BP1u +yVqZPhg7+nSs0hiQswdf59/DNT50xbjlE3r5i0g8xoCOwKRIRjGVW3N3Qlu+T//9 +PjBWemCOp2p7ZNVWicL/LIQEiIHzkgDPciGbVtHx8aKle9qya5jjkU+GpIT1LMut +xkug3OX9EBDDk17irzdPpFktFhmiI38kovVko6s+MmMVSt4bgQTwzrJuyOzTZWGZ +XJp0TbIgIyMZ5nN0n4RUdQftuq1GErHU6La3NZtmV/rdiFYZralwzI0ghWZE2etW +wnpn+Z0BjKwAtw3p4JFY3qJjMVQQqYwKZrqtIj3mMu8v35jNfxo= +=Y+Px +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index e213535..f8721f9 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Nov 14 00:00:13 UTC 2020 - Christophe Giboudeaux + +- Update to 20.11.80 + * New feature release +- Too many changes since 20.08.3, only listing bugfixes: + * AgentBase: Fix crash in setOnline (kde#418844) + ------------------------------------------------------------------- Thu Nov 5 22:45:08 UTC 2020 - Luca Beltrame diff --git a/akonadi-server.spec b/akonadi-server.spec index 87af212..a2f1298 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -17,18 +17,18 @@ %define rname akonadi -%define kf5_version 5.63.0 +%define kf5_version 5.75.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 20.08.3 +Version: 20.11.80 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://akonadi-project.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem @@ -66,8 +66,6 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) Requires: libqt5-sql-mysql Requires: mysql -Requires(post): shared-mime-info -Requires(postun): shared-mime-info # FIXME: Check if it's worth it Recommends: kaccounts-integration Recommends: kaccounts-providers @@ -78,7 +76,7 @@ Provides: akonadi5 = %{version} Obsoletes: akonadi < %{version} Obsoletes: akonadi-runtime < %{version} %if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig Source2: applications.keyring %endif @@ -166,7 +164,7 @@ service. %lang_package %prep -%autosetup -p1 -n %{rname}-%{version} +%setup -q -n %{rname}-%{version} %build %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} -DINSTALL_APPARMOR=FALSE @@ -179,7 +177,6 @@ service. %endif %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %post -n libKF5AkonadiWidgets5 -p /sbin/ldconfig From 5776f23b32b2fe08cae6fddb9ec7cdde5235236a56a4957a19ca95ae17a8bf0e Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 23 Nov 2020 12:55:46 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=258 --- ...ing-akonadiprivate_obj-with-out-of-s.patch | 29 ++++++++++++++ ...-Don-t-use-the-LZMA-imported-targets.patch | 39 +++++++++++++++++++ akonadi-server.changes | 7 ++++ akonadi-server.spec | 5 ++- 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch create mode 100644 0002-CMake-Don-t-use-the-LZMA-imported-targets.patch diff --git a/0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch b/0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch new file mode 100644 index 0000000..00ab138 --- /dev/null +++ b/0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch @@ -0,0 +1,29 @@ +From 35c64fc2244821297d512fb5ff15cd342d5150f7 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Mon, 23 Nov 2020 08:29:34 +0100 +Subject: [PATCH 1/3] Revert "Fix building akonadiprivate_obj with out of + system lzma libs on macOS" + +Using target_link_libraries with 'OBJECT' libraries breaks the build with older +CMake versions. + +This reverts commit 2faa9de706d250be62689a4efebe8a143d6da47c. +--- + src/private/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt +index 14eba9da5..1e40a1d61 100644 +--- a/src/private/CMakeLists.txt ++++ b/src/private/CMakeLists.txt +@@ -62,7 +62,6 @@ if (WIN32) + set(akonadiprivate_buildsources ${akonadiprivate_SRCS}) + else() + add_library(akonadiprivate_obj OBJECT ${akonadiprivate_SRCS}) +- target_link_libraries(akonadiprivate_obj ${akonadiprivate_LIBS}) + update_include_directories(akonadiprivate_obj) + set_target_properties(akonadiprivate_obj PROPERTIES POSITION_INDEPENDENT_CODE 1) + add_dependencies(akonadiprivate_obj generate_protocol) +-- +2.29.2 + diff --git a/0002-CMake-Don-t-use-the-LZMA-imported-targets.patch b/0002-CMake-Don-t-use-the-LZMA-imported-targets.patch new file mode 100644 index 0000000..1898ebc --- /dev/null +++ b/0002-CMake-Don-t-use-the-LZMA-imported-targets.patch @@ -0,0 +1,39 @@ +From 0586ae9d4f4fc5ef27b11e6c397f049bbd405e19 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Mon, 23 Nov 2020 08:40:10 +0100 +Subject: [PATCH 2/3] CMake: Don't use the LZMA imported targets + +LibLZMA::LibLZMA was introduced in CMake 3.14. +We need to use the old style link targets. This should also +fix a build issue on macOS when LZMA is not installed into +standard locations. + +amends commit 2bf3a5c9 +--- + src/private/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt +index 1e40a1d61..23f172e47 100644 +--- a/src/private/CMakeLists.txt ++++ b/src/private/CMakeLists.txt +@@ -1,5 +1,7 @@ + add_subdirectory(protocolgen) + ++include_directories(${LIBLZMA_INCLUDE_DIRS}) ++ + if(NOT XMLLINT_EXECUTABLE) + message(STATUS "xmllint not found, skipping protocol.xml validation") + else() +@@ -34,7 +36,7 @@ PUBLIC + Qt5::Core + Qt5::DBus + PRIVATE +- LibLZMA::LibLZMA ++ ${LIBLZMA_LIBRARIES} + ) + if (WIN32) + set(akonadiprivate_LIBS +-- +2.29.2 + diff --git a/akonadi-server.changes b/akonadi-server.changes index f8721f9..942968d 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 23 12:54:23 UTC 2020 - Christophe Giboudeaux + +- Add upstream patches to fix build with older CMake versions: + * 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch + * 0002-CMake-Don-t-use-the-LZMA-imported-targets.patch + ------------------------------------------------------------------- Sat Nov 14 00:00:13 UTC 2020 - Christophe Giboudeaux diff --git a/akonadi-server.spec b/akonadi-server.spec index a2f1298..5673b19 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -30,6 +30,9 @@ Group: System/GUI/KDE URL: https://akonadi-project.org Source: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch0: 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch +Patch1: 0002-CMake-Don-t-use-the-LZMA-imported-targets.patch BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel @@ -164,7 +167,7 @@ service. %lang_package %prep -%setup -q -n %{rname}-%{version} +%autosetup -p1 -n %{rname}-%{version} %build %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} -DINSTALL_APPARMOR=FALSE From f22304e1dd1618f1ad40a3123a0593fa85ce311135afcb1641d2a1475ee95806 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Mon, 30 Nov 2020 11:05:29 +0000 Subject: [PATCH 3/5] 20.11.90 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=259 --- ...ing-akonadiprivate_obj-with-out-of-s.patch | 29 -------------- ...-Don-t-use-the-LZMA-imported-targets.patch | 39 ------------------- akonadi-20.11.80.tar.xz | 3 -- akonadi-20.11.80.tar.xz.sig | 16 -------- akonadi-20.11.90.tar.xz | 3 ++ akonadi-20.11.90.tar.xz.sig | 11 ++++++ akonadi-server.changes | 14 +++++++ akonadi-server.spec | 5 +-- 8 files changed, 29 insertions(+), 91 deletions(-) delete mode 100644 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch delete mode 100644 0002-CMake-Don-t-use-the-LZMA-imported-targets.patch delete mode 100644 akonadi-20.11.80.tar.xz delete mode 100644 akonadi-20.11.80.tar.xz.sig create mode 100644 akonadi-20.11.90.tar.xz create mode 100644 akonadi-20.11.90.tar.xz.sig diff --git a/0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch b/0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch deleted file mode 100644 index 00ab138..0000000 --- a/0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 35c64fc2244821297d512fb5ff15cd342d5150f7 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Mon, 23 Nov 2020 08:29:34 +0100 -Subject: [PATCH 1/3] Revert "Fix building akonadiprivate_obj with out of - system lzma libs on macOS" - -Using target_link_libraries with 'OBJECT' libraries breaks the build with older -CMake versions. - -This reverts commit 2faa9de706d250be62689a4efebe8a143d6da47c. ---- - src/private/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt -index 14eba9da5..1e40a1d61 100644 ---- a/src/private/CMakeLists.txt -+++ b/src/private/CMakeLists.txt -@@ -62,7 +62,6 @@ if (WIN32) - set(akonadiprivate_buildsources ${akonadiprivate_SRCS}) - else() - add_library(akonadiprivate_obj OBJECT ${akonadiprivate_SRCS}) -- target_link_libraries(akonadiprivate_obj ${akonadiprivate_LIBS}) - update_include_directories(akonadiprivate_obj) - set_target_properties(akonadiprivate_obj PROPERTIES POSITION_INDEPENDENT_CODE 1) - add_dependencies(akonadiprivate_obj generate_protocol) --- -2.29.2 - diff --git a/0002-CMake-Don-t-use-the-LZMA-imported-targets.patch b/0002-CMake-Don-t-use-the-LZMA-imported-targets.patch deleted file mode 100644 index 1898ebc..0000000 --- a/0002-CMake-Don-t-use-the-LZMA-imported-targets.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0586ae9d4f4fc5ef27b11e6c397f049bbd405e19 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Mon, 23 Nov 2020 08:40:10 +0100 -Subject: [PATCH 2/3] CMake: Don't use the LZMA imported targets - -LibLZMA::LibLZMA was introduced in CMake 3.14. -We need to use the old style link targets. This should also -fix a build issue on macOS when LZMA is not installed into -standard locations. - -amends commit 2bf3a5c9 ---- - src/private/CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt -index 1e40a1d61..23f172e47 100644 ---- a/src/private/CMakeLists.txt -+++ b/src/private/CMakeLists.txt -@@ -1,5 +1,7 @@ - add_subdirectory(protocolgen) - -+include_directories(${LIBLZMA_INCLUDE_DIRS}) -+ - if(NOT XMLLINT_EXECUTABLE) - message(STATUS "xmllint not found, skipping protocol.xml validation") - else() -@@ -34,7 +36,7 @@ PUBLIC - Qt5::Core - Qt5::DBus - PRIVATE -- LibLZMA::LibLZMA -+ ${LIBLZMA_LIBRARIES} - ) - if (WIN32) - set(akonadiprivate_LIBS --- -2.29.2 - diff --git a/akonadi-20.11.80.tar.xz b/akonadi-20.11.80.tar.xz deleted file mode 100644 index b564ded..0000000 --- a/akonadi-20.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05b7fa5cc8f919c0f7b7d2db4747b27e4365348851109d84d51c58ba9df3a45b -size 1592728 diff --git a/akonadi-20.11.80.tar.xz.sig b/akonadi-20.11.80.tar.xz.sig deleted file mode 100644 index bd24b65..0000000 --- a/akonadi-20.11.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uoloACgkQOmpNuDnq -ptdxrg//cVzA6ZFxovd6hoCy8OjdIpTPmzKBjFCWfCDZXDop2XcNKlozJpDolDNy -4CmqWACSzAu3K3G1PNm9270jf1QRI0VNf5jHUAgPxeK6px5WWyDTw/8k45K9MkZZ -X6J0z6LoukPU9QHvufw2MS09Fb7L8LHW1z9uTvA9neZvElQUq5FX9FwJyxHfpzbI -3e0XYpAuNCt8x6DM3BVH7HXrYx1h/q/dfIWP8M6xxjxchnR1IuOQZLBrckgbzqy9 -Y6kTuzK8u3j/QSf+U9EVIVKCOyC58VnRow9OMo4eRQn0IAjRinA2HfrzYdQnREcT -Rwb6bxa072Vb1tJEOGz+WTAndZFpQOi5VH6AwFBO2EO4RFarwFerFNGl2S3+BP1u -yVqZPhg7+nSs0hiQswdf59/DNT50xbjlE3r5i0g8xoCOwKRIRjGVW3N3Qlu+T//9 -PjBWemCOp2p7ZNVWicL/LIQEiIHzkgDPciGbVtHx8aKle9qya5jjkU+GpIT1LMut -xkug3OX9EBDDk17irzdPpFktFhmiI38kovVko6s+MmMVSt4bgQTwzrJuyOzTZWGZ -XJp0TbIgIyMZ5nN0n4RUdQftuq1GErHU6La3NZtmV/rdiFYZralwzI0ghWZE2etW -wnpn+Z0BjKwAtw3p4JFY3qJjMVQQqYwKZrqtIj3mMu8v35jNfxo= -=Y+Px ------END PGP SIGNATURE----- diff --git a/akonadi-20.11.90.tar.xz b/akonadi-20.11.90.tar.xz new file mode 100644 index 0000000..6559969 --- /dev/null +++ b/akonadi-20.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10a4ef1b51ee1095b3fb91d9781018a552533070f7a10c4ab7de56550dc17632 +size 1593040 diff --git a/akonadi-20.11.90.tar.xz.sig b/akonadi-20.11.90.tar.xz.sig new file mode 100644 index 0000000..3eefe02 --- /dev/null +++ b/akonadi-20.11.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/ATqcACgkQ29LOiT4t +HIf0AAf/RPSVzcgv5NfhaBO82n66eXc8ZQXoyCjNI0NFFcJK4NW6LLc7p8UZ23X1 +YaR/VkCjJmEcEKqsZxA7mL0f+3UVGiMtZ2ERNE0Te38bfWthn6rCP+8jPmxm6XU2 +tO754E9ii2irWep++3BvlvFtZ24QAA9tqxir63eJ2XeweDn/duUbWUCftIr+4XaS +9HlA7gLxfYeMVxF5u0EPy5mUWCAFIj3+C74EJ3Kn4vFyn8oLHXjySnlrOT4aSQRq +HlMmp9vlmL9LUuzf62GH4IB8WF8NtGCeflvIyQ/yAdwh4UfKGeDwBwxy0GnegM2f +6PfJTJ3M63Gd2ipwltedKLURp2aAwA== +=U7iG +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index 942968d..595209d 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Nov 27 15:15:25 UTC 2020 - Christophe Giboudeaux + +- Update to 20.11.90 + * New feature release +- Changes since 20.11.80: + * Check if external library is needed to have atomic support. + * CMake: Don't use the LZMA imported targets + * Install compressionstream private header + * Introduce Config class, disable payload comp. by default +- Drop obsolete patches: + * 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch + * 0002-CMake-Don-t-use-the-LZMA-imported-targets.patch + ------------------------------------------------------------------- Mon Nov 23 12:54:23 UTC 2020 - Christophe Giboudeaux diff --git a/akonadi-server.spec b/akonadi-server.spec index 5673b19..9bd8df9 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -22,7 +22,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 20.11.80 +Version: 20.11.90 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later @@ -30,9 +30,6 @@ Group: System/GUI/KDE URL: https://akonadi-project.org Source: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc -# PATCH-FIX-UPSTREAM -Patch0: 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch -Patch1: 0002-CMake-Don-t-use-the-LZMA-imported-targets.patch BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel From 6ac8a37818534009043ac219c707629ad27fdd6f2588163e6fc6ada046eef56e Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 8 Dec 2020 07:24:32 +0000 Subject: [PATCH 4/5] KDE Applications 20.12.0 final: release on 10th Dec OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=260 --- akonadi-20.11.90.tar.xz | 3 --- akonadi-20.11.90.tar.xz.sig | 11 ----------- akonadi-20.12.0.tar.xz | 3 +++ akonadi-20.12.0.tar.xz.sig | 11 +++++++++++ akonadi-server.changes | 9 +++++++++ akonadi-server.spec | 6 +++--- 6 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 akonadi-20.11.90.tar.xz delete mode 100644 akonadi-20.11.90.tar.xz.sig create mode 100644 akonadi-20.12.0.tar.xz create mode 100644 akonadi-20.12.0.tar.xz.sig diff --git a/akonadi-20.11.90.tar.xz b/akonadi-20.11.90.tar.xz deleted file mode 100644 index 6559969..0000000 --- a/akonadi-20.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10a4ef1b51ee1095b3fb91d9781018a552533070f7a10c4ab7de56550dc17632 -size 1593040 diff --git a/akonadi-20.11.90.tar.xz.sig b/akonadi-20.11.90.tar.xz.sig deleted file mode 100644 index 3eefe02..0000000 --- a/akonadi-20.11.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/ATqcACgkQ29LOiT4t -HIf0AAf/RPSVzcgv5NfhaBO82n66eXc8ZQXoyCjNI0NFFcJK4NW6LLc7p8UZ23X1 -YaR/VkCjJmEcEKqsZxA7mL0f+3UVGiMtZ2ERNE0Te38bfWthn6rCP+8jPmxm6XU2 -tO754E9ii2irWep++3BvlvFtZ24QAA9tqxir63eJ2XeweDn/duUbWUCftIr+4XaS -9HlA7gLxfYeMVxF5u0EPy5mUWCAFIj3+C74EJ3Kn4vFyn8oLHXjySnlrOT4aSQRq -HlMmp9vlmL9LUuzf62GH4IB8WF8NtGCeflvIyQ/yAdwh4UfKGeDwBwxy0GnegM2f -6PfJTJ3M63Gd2ipwltedKLURp2aAwA== -=U7iG ------END PGP SIGNATURE----- diff --git a/akonadi-20.12.0.tar.xz b/akonadi-20.12.0.tar.xz new file mode 100644 index 0000000..c175fdf --- /dev/null +++ b/akonadi-20.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37318b79992264e996d8afa14fa332e984a60e3a31de36f6da03ca395c2e6813 +size 1593204 diff --git a/akonadi-20.12.0.tar.xz.sig b/akonadi-20.12.0.tar.xz.sig new file mode 100644 index 0000000..150dd7e --- /dev/null +++ b/akonadi-20.12.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/JhGkACgkQ29LOiT4t +HIcFSgf/YlJ30aGW6fwIeqap4WBA1kAmZnU5BQ0oK7gWOjXJIbt1DTbN7oK3sGvz +7+UPsrw6fSjo7uO4ihaOtLo8fChNzLLbyEAISXoh6Zb+qHeXv8OwDJh19oKXUfxL +biVWrZ8e189fQ6ywAV+BwhX4j1ALU5a038wu3v7wSaSXhAlr1QQe9Y1JCYnLmpak +AlyW7UqWMhd8XqOQvprErEVYExXuLqGWbwD7+Am/9sWd/5f7/BH7zCSToQMri50D +RhMcP7vk3BKlO+1pg//O+irMap52vP/X6B3WbPfFyycjj1zQmCqTg+Lx6T4oMJ5B +tUGjPGGZXfxnCDcD0VUVd2dtSCNRJw== +=0n60 +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index 595209d..839bdc3 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Dec 5 23:15:07 UTC 2020 - Luca Beltrame + +- Update to 20.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-12-apps-update +- No code change since 20.11.90 + ------------------------------------------------------------------- Fri Nov 27 15:15:25 UTC 2020 - Christophe Giboudeaux diff --git a/akonadi-server.spec b/akonadi-server.spec index 9bd8df9..7db38af 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -22,13 +22,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 20.11.90 +Version: 20.12.0 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://akonadi-project.org -Source: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem @@ -76,7 +76,7 @@ Provides: akonadi5 = %{version} Obsoletes: akonadi < %{version} Obsoletes: akonadi-runtime < %{version} %if %{with lang} -Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig Source2: applications.keyring %endif From ae393b82b3c3da92ba2da91bc9ad324b7f1bba444aa68010bad852c5afa5ee61 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 8 Dec 2020 14:40:23 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=261 --- akonadi-server.changes | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/akonadi-server.changes b/akonadi-server.changes index 839bdc3..c178af7 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -15,7 +15,7 @@ Fri Nov 27 15:15:25 UTC 2020 - Christophe Giboudeaux - Changes since 20.11.80: * Check if external library is needed to have atomic support. * CMake: Don't use the LZMA imported targets - * Install compressionstream private header + * Revert "Fix building akonadiprivate_obj with out of system lzma libs on macOS" * Install compressionstream private header * Introduce Config class, disable payload comp. by default - Drop obsolete patches: * 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch @@ -33,8 +33,7 @@ Sat Nov 14 00:00:13 UTC 2020 - Christophe Giboudeaux - Update to 20.11.80 * New feature release -- Too many changes since 20.08.3, only listing bugfixes: - * AgentBase: Fix crash in setOnline (kde#418844) +- Too many changes to list here. ------------------------------------------------------------------- Thu Nov 5 22:45:08 UTC 2020 - Luca Beltrame