Accepting request 997748 from KDE:Applications

KDE Release Gear 22.08.0 (forwarded request 997667 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/997748
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=100
This commit is contained in:
Dominique Leuenberger 2022-08-19 15:51:29 +00:00 committed by Git OBS Bridge
commit e20480cba5
7 changed files with 45 additions and 52 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e0221807ed291562ec38262907ecc338b19acfcbba9093db9007825a83c473c
size 1626632

View File

@ -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-----

3
akonadi-22.08.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed6bda235ff516799bb61f8ef0653c57a7ac747b43e0407d95de1c3673f7fbbd
size 1630904

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmL2HZsACgkQOmpNuDnq
ptc5eg//Rt6vm1y5TYSim0LR1hTCuRHUprII/LeOYsnpVM5CWxtFrI0UP4EyDCEx
lsgiH8lb5yFQYuDFtTvyGPYFb81YFIFiDzVFywW5ShS0i4W0eNqsBIwhuErlpXQO
syrnJZmX5jYLPyt9mnoP6CM3434gB8xXd+3my1f3foJ9E8Zjrdvxp6IRZ8U7o/dV
qJvhHgfX314Go3vYt7ZmSLYYNKVU69gBh2R0tatP+XrVAlYCqnsoSZKp74U2lprj
3J67iwfn7ZZqgI8GPE1fJBENEZXif2ZMD2zzLUk3e0HSU2D61OThWD6MX3NCW6hz
WvtgqyXfkExurcqjGWbWMJNhj8JpFCZu9t2lQBezXke6mpjmu1d0Mijng875vtnD
qmbtDcm09T0nsOBs8uqT2cuyundZl4SYl+A7D/+zZ4XgdkXLERuAV7uzifd8iGGj
G+KEaY12vQFV1GSBL0KEjjXLvjhCb2CJ5SZohDlBEvXSoLri7pgUiJEPIekwdivf
n3c7siLlNG5sPeEtPkJQV0Rr1ZYovQcviL9DEmzxDmnfwW0TkXjwkzCv/zHKni8g
8UvV8rZrAO0GQCBLa0rnz1KbANo3w143Ey2c4idq+enrIp1a5Qt0IGaRf51JJ7RY
CgeQiD9xmBazDGWBW9+zkX9+4rI09hq6Iz/IDDoZk+NLXbhhAaE=
=D/Gh
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sun Aug 14 09:41:22 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 22.08.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/22.08.0/
-------------------------------------------------------------------
Fri Aug 5 12:10:10 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 22.07.90
* New feature release
-------------------------------------------------------------------
Sat Jul 16 08:27:25 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- 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 <christophe@krop.fr>

View File

@ -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,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without released
Name: akonadi-server
Version: 22.04.3
Version: 22.08.0
Release: 0
Summary: PIM Storage Service
License: LGPL-2.1-or-later
@ -34,8 +34,6 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%
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

View File

@ -1,27 +0,0 @@
From a6fb4c7de13eed9d90237388113425413bf4d733 Mon Sep 17 00:00:00 2001
From: Christian Boltz <kde-bugs@cboltz.de>
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 <abi/3.0>,
/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