Accepting request 977332 from home:cboltz:branches:KDE:Applications

- add akonadiserver-apparmor-typos-mr94.patch to ensure mariadbd_akonadi
  AppArmor profile actually gets used

I also submitted this fix to https://invent.kde.org/pim/akonadi/-/merge_requests/94

OBS-URL: https://build.opensuse.org/request/show/977332
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=307

akonadi-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun May 15 13:27:13 UTC 2022 - Christian Boltz <suse-beta@cboltz.de>
+
+- add akonadiserver-apparmor-typos-mr94.patch to ensure mariadbd_akonadi
+  AppArmor profile actually gets used
+
 -------------------------------------------------------------------
 Tue May 10 16:29:17 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 

akonadi-server.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package akonadi-server
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,7 @@ Source1:        https://download.kde.org/stable/release-service/%{version}/src/%
 Source2:        applications.keyring
 %endif
 Source99:       akonadi-server-rpmlintrc
+Patch1:         akonadiserver-apparmor-typos-mr94.patch
 BuildRequires:  apparmor-abstractions
 BuildRequires:  apparmor-rpm-macros
 BuildRequires:  extra-cmake-modules >= %{kf5_version}

akonadiserver-apparmor-typos-mr94.patch

@@ -0,0 +1,30 @@
+From https://invent.kde.org/pim/akonadi/-/merge_requests/94
+
+
+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
+