From 07aed0564abc0a3b2ef8153b7002b202ca30e3d432a2a7289e95345e8e190be4 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 9 Aug 2022 14:12:09 +0000 Subject: [PATCH] KDE Release Gear 22.08 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=314 --- akonadi-22.04.3.tar.xz | 3 --- akonadi-22.04.3.tar.xz.sig | 16 --------------- akonadi-22.07.90.tar.xz | 3 +++ akonadi-22.07.90.tar.xz.sig | 16 +++++++++++++++ akonadi-server.changes | 13 ++++++++++++ akonadi-server.spec | 15 +++++++------- akonadiserver-apparmor-typos-mr94.patch | 27 ------------------------- 7 files changed, 39 insertions(+), 54 deletions(-) delete mode 100644 akonadi-22.04.3.tar.xz delete mode 100644 akonadi-22.04.3.tar.xz.sig create mode 100644 akonadi-22.07.90.tar.xz create mode 100644 akonadi-22.07.90.tar.xz.sig delete mode 100644 akonadiserver-apparmor-typos-mr94.patch diff --git a/akonadi-22.04.3.tar.xz b/akonadi-22.04.3.tar.xz deleted file mode 100644 index 6cafc4f..0000000 --- a/akonadi-22.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e0221807ed291562ec38262907ecc338b19acfcbba9093db9007825a83c473c -size 1626632 diff --git a/akonadi-22.04.3.tar.xz.sig b/akonadi-22.04.3.tar.xz.sig deleted file mode 100644 index 82d3763..0000000 --- a/akonadi-22.04.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmLDwKEACgkQu0YzUNbv -Me+n4g//aCv1fGoEDSbAvw7Y1PaVK26Gn4F/R238BnbDPq71cPN29/Jbc2Cai+fP -5uOBVR645iU8ztPiOu3psdyoJbNzNJrotGNDu6lS5RB1Xcav6620Pwbb3YAX/Sjm -QvE/+UJFO3BJABQVLa30fDiHLuKQtHIzYY/xROxbZopvTpAb9X1692e06638kArl -N5nniXBMUGAnFbFo2Fjjgj8mmbaTCj16dLnxHsfBJ+j5ZrMYq+2EtGy/R6qSwOu8 -7UW2KCXuDKYoyBTZL1q6nype/ZO0GPra1YphiNUIhgfVLrwkODbK1l22Z3OQKfie -kUqSZeSb6y76z9nZfsXdwUopUpC3osJinKY2WQQUCQ/n+/IftPP+IciwBpFrZOpi -idM8uX5qVa1u88em3J1cYNl6+rCSPmVtvgNEEkFN111FgBg7nXlpCnRUFnO+cLWP -MqZYrLojnZN8aumo4+ZXeYNa80GovcgNtPZf1fbvBc8US0yqWkfDVAFamVpOaJiP -FzcRnlfLRG6tCNUVvTogPcT0A13ezMblQ3YpJwtZ8vIqWFlmUM7N9l+M4l97XmoD -P2YeHpeCRhjqcPF8pRpxq+AtuNwBrek5Wvd1sPNCIhp1HiGQHlAftzwwtIMU8fCd -Kdf6alNq9KdnVKgXR+9Z9DYw3wnVZJIMJJouTcZNrtDrwT94NSY= -=vw0V ------END PGP SIGNATURE----- diff --git a/akonadi-22.07.90.tar.xz b/akonadi-22.07.90.tar.xz new file mode 100644 index 0000000..b60fd73 --- /dev/null +++ b/akonadi-22.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52a054fb43d00b2884b4b69693b53d04d253534dbebdb5b4d7edda9e4c212e3b +size 1630844 diff --git a/akonadi-22.07.90.tar.xz.sig b/akonadi-22.07.90.tar.xz.sig new file mode 100644 index 0000000..84cc7f2 --- /dev/null +++ b/akonadi-22.07.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmLsYYYACgkQu0YzUNbv +Me9fBQ//RSRK0t3juFv3ZWo8AU+Mdc2USPEzrhlq/QD+32akHx+sIgntY+E0iGx+ +ndGdSpzQPb2y70aZtCJodc3+Bo6lhCw6fbDXeiagBoVma/H2WbAoGtOFC4UgmFll +mLjV2VygTE/VxRrt/37qAXnNV4qcHLluBbeeNyA+3Vf1vP/nJWM3Q7BdmiLcEUQF +AGZ7CPpgvUf4jh6aszqMdmQrBceuT+HV6jEuB5xeGP40pjrcN0ax+pS++JOJ2aOK +Hb6Kw1OTrMYK73dVRsRQHybS6cQjn/dHP5xFzlENgwcn2KTqQC0+7Ytvnk7bOlQs +mQHq6PJnCOPOL+DsT5oDUBrEJnpkH6vzI/M7bVs0gv13uY7DDA95h+4s/sUPTU76 +B2uHjMMu3jinoAGVb83MyBCzQiMWYrxfTea+V8zMiEoTmjs0DXlxKsLg4RK033Px +84/JtuHp882IAGrKC/qnKfuaaBjqv/K2Oe4QlbweLLJN9h5BKyhn/ozH+79sOVm3 +GKckxfio4bXC/MgFE6yIh26vZnQoj/0wbYDxBgW9FdnhThDGvePuxAW+WoGhhGId +wQrR1oeHW4cFqqXc+8VERMUcfXkhMzRiwKdjcX//8QHufHKqjCqyxhNO667EIpna +50zr8ZQY3qjS4SI5It1gSejGd9JVE6W+uNcA7C4XpDoAs2kFrwo= +=zZUU +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index c6ab0b6..03afaa9 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Aug 5 12:10:10 UTC 2022 - Christophe Giboudeaux + +- Update to 22.07.90 + * New feature release + +------------------------------------------------------------------- +Sat Jul 16 08:27:25 UTC 2022 - Christophe Giboudeaux + +- Update to 22.07.80 + * New feature release +- Drop akonadiserver-apparmor-typos-mr94.patch. Fixed upstream + ------------------------------------------------------------------- Tue Jul 5 17:02:39 UTC 2022 - Christophe Giboudeaux diff --git a/akonadi-server.spec b/akonadi-server.spec index 9284989..a33a008 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -1,7 +1,7 @@ # # spec file for package akonadi-server # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,20 +22,18 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: akonadi-server -Version: 22.04.3 +Version: 22.07.90 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 %if %{with released} -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 Source99: akonadi-server-rpmlintrc -# PATCH-FIX-UPSTREAM https://invent.kde.org/pim/akonadi/-/merge_requests/94 -Patch1: akonadiserver-apparmor-typos-mr94.patch BuildRequires: apparmor-abstractions BuildRequires: apparmor-rpm-macros BuildRequires: extra-cmake-modules >= %{kf5_version} @@ -150,6 +148,7 @@ Requires: cmake(KF5Config) Requires: cmake(KF5ConfigWidgets) Requires: cmake(KF5CoreAddons) Requires: cmake(KF5ItemModels) +Requires: cmake(KF5KIO) Requires: cmake(KF5XmlGui) Requires: cmake(Qt5Core) Requires: cmake(Qt5DBus) @@ -211,6 +210,7 @@ This package contains AppArmor profiles for Akonadi. %dir %{_kf5_iconsdir}/hicolor/256x256 %dir %{_kf5_iconsdir}/hicolor/256x256/apps %dir %{_kf5_sysconfdir}/xdg/akonadi +%dir %{_kf5_plugindir}/pim5 %{_datadir}/akonadi/ %{_datadir}/kf5/akonadi/ %{_datadir}/kf5/akonadi_knut_resource/ @@ -224,7 +224,7 @@ This package contains AppArmor profiles for Akonadi. %{_kf5_debugdir}/akonadi.*categories %{_kf5_iconsdir}/hicolor/*/apps/akonadi.png %{_kf5_iconsdir}/hicolor/scalable/apps/akonadi.svgz -%{_kf5_plugindir}/akonadi/ +%{_kf5_plugindir}/pim5/akonadi/ %{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %{_kf5_sharedir}/mime/packages/akonadi-mime.xml @@ -256,7 +256,6 @@ This package contains AppArmor profiles for Akonadi. %{_kf5_includedir}/AkonadiCore/ %{_kf5_includedir}/AkonadiWidgets/ %{_kf5_includedir}/AkonadiXml/ -%{_kf5_includedir}/akonadi_version.h %{_kf5_libdir}/libKF5AkonadiAgentBase.so %{_kf5_libdir}/libKF5AkonadiCore.so %{_kf5_libdir}/libKF5AkonadiPrivate.so diff --git a/akonadiserver-apparmor-typos-mr94.patch b/akonadiserver-apparmor-typos-mr94.patch deleted file mode 100644 index f670250..0000000 --- a/akonadiserver-apparmor-typos-mr94.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a6fb4c7de13eed9d90237388113425413bf4d733 Mon Sep 17 00:00:00 2001 -From: Christian Boltz -Date: Sun, 15 May 2022 15:16:06 +0200 -Subject: [PATCH] Fix typos in AppArmor target profile name - ---- - apparmor/usr.bin.akonadiserver | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/apparmor/usr.bin.akonadiserver b/apparmor/usr.bin.akonadiserver -index 83b654abd..5c05f351d 100644 ---- a/apparmor/usr.bin.akonadiserver -+++ b/apparmor/usr.bin.akonadiserver -@@ -45,8 +45,8 @@ abi , - /usr/libexec/drkonqi PUx, - /usr/bin/mariadb-admin PUx -> mariadbd_akonadi, - /usr/bin/mariadb-check PUx -> mariadbd_akonadi, -- /usr/bin/mariadb-install-db PUx -> mariaddbd_akonadi, -- /usr/{,s}bin/mariadbd PUx -> mariaddbd_akonadi, -+ /usr/bin/mariadb-install-db PUx -> mariadbd_akonadi, -+ /usr/{,s}bin/mariadbd PUx -> mariadbd_akonadi, - /usr/bin/mysql_install_db PUx -> mysqld_akonadi, - /usr/bin/mysqladmin PUx -> mysqld_akonadi, - /usr/bin/mysqlcheck PUx -> mysqld_akonadi, --- -GitLab -