Accepting request 971385 from KDE:Applications

KDE release gear 22.04.0 OBS-URL: https://build.opensuse.org/request/show/971385 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/akonadi-server?expand=0&rev=95
2022-04-23 22:19:00 +00:00 · 2022-04-23 22:19:00 +00:00 · a0be2f1ea9
commit a0be2f1ea9
parent 11887228c7 af8260e87a
7 changed files with 67 additions and 52 deletions
--- a/0001-Apparmor-Also-look-in-usr-libexec.patch
+++ b/0001-Apparmor-Also-look-in-usr-libexec.patch
@ -1,27 +0,0 @@
-From 2ce37b8cbe37772dde28ee510a0050e5444edc67 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Fri, 11 Mar 2022 11:33:41 +0100
-Subject: [PATCH] Apparmor: Also look in /usr/libexec
-
-FHS 3.0 states that executables not intended to be executed by users shall be under /usr/libexec [1]
-
-[1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html
---
- apparmor/usr.bin.akonadiserver | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/apparmor/usr.bin.akonadiserver b/apparmor/usr.bin.akonadiserver
-index a8e20045b..83b654abd 100644
--- a/apparmor/usr.bin.akonadiserver
-+++ b/apparmor/usr.bin.akonadiserver
-@@ -42,6 +42,7 @@ abi <abi/3.0>,
-   /usr/bin/akonadiserver mr,
-   /usr/lib/x86_64-linux-gnu/libexec/drkonqi PUx,
-   /usr/lib{,64}/libexec/drkonqi PUx,
-+  /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,
-- 
-2.35.1
-
--- a/akonadi-21.12.3.tar.xz
+++ b/akonadi-21.12.3.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fe8ded706faf6ce87a48b7f164cbdd4eb71a342501eb9a0db40a87666cfda08
-size 1611056
--- a/akonadi-21.12.3.tar.xz.sig
+++ b/akonadi-21.12.3.tar.xz.sig
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmIdZbQACgkQu0YzUNbv
-Me91HxAAh7/5hlApDJBkEzcB1pDuVuZEqdGBHqBoZCNOfmLXxSKFUv5YGyLRNpe7
-KqdaBsk6ALyJMdp1EkLoRV9uuapqg+Zc3wPdIjFYtOJtg9XnG8QH9kl86QiMCygn
-oubsbBMTjZSH6GkTmYslH89QZviPD0XMsCF+lay3p+av0lgKmAyfhce+NJN05j7A
-365/444ugvzTJDMMG4OiwVBzz8SGPmIyoE3nkEvkwEj232UGeS91DF3hzhPpSKL+
-1RQvNQ4oyM+/KeJolrcbwMJbX/clZg58R9zlfgagd/ijs+izf9lxxOPSbZIMQb8W
-VYQtKP3UG95JyRDmNaqoZAJPj+iEUzSkb/RiKnZhdGdJdss4JK/UA0HwkTX5AiKK
-b5GW7N80mFFWcK7idMiCErZQ2FOS/QR3uaacVpAyHNvCXQ7SspPlJCUJhNjhHy2q
-k2J0kWl2kv7n30eUPZxMRVoSWNjWbdvK4LYUYKWZDb1isY/nickUjUf3rTuTBOaK
-fLJnQSDlnzsB3oP6OiXTm2WcvSfvUpjnQr8Uu7Y7831iv1Sj7jTsd2Ee1OmBwITx
-FMZEuHesrDg9ipAGg1FP9kppw907XWvmEB6p5HLJzQsc4SbD3cIImZvTT55oHaNZ
-ABW8iDN0ARMIgaFvF+huI7UauWwN7HPe4qxdkwNpZTNl/QL7Jkg=
-=J+If
-----END PGP SIGNATURE-----
--- a/akonadi-22.04.0.tar.xz
+++ b/akonadi-22.04.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07c6cce2165b873dcc331e2e961c45c2ab27efd8fd787d5c36ae8c719abd8bec
+size 1612416
--- a/akonadi-22.04.0.tar.xz.sig
+++ b/akonadi-22.04.0.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmJYukgACgkQu0YzUNbv
+Me96Jg/9ElMlOKjQDeHZj7If07C80qDyACwnieB7b4L46FdNuOZn49nvjy2XR097
+B1NnakGrXEExZiJZEkkjb/8ZiBhb+b+vjdEc/LAlfO/nYShoYDxYxSPyJ359GAlz
+cQ4TZfMMMQD+JPWMh9Ggt4TwR4UshbpB2uM2o/DePKpr8Ksj6ap5ur7LW4ZZ276T
+fOIhJRaFcCEzEH7aQQXNWHObg5hHNx0nfqlX+vHSubhjDYnid/6ZhNE3pijg3GEj
+OFj44Yy7T64s4Rnf51oD9B7lkTNzKuHZuQM395W85e7s+1TAMKyYHRLcxoNX3R+1
+PWDjmLcD9SI9h/1DRc9p1lmkVkA6w7CRGJMVYMipForFZwN82QiFmUwUmna3l9Cz
+KecMW124b7gYMdPw0RlkGhIdnPPbaenb1y/9WGe6Wi3+aCj5JOyNpEznfVQJej1n
+OHLC2nbM9YQJis273nq3uiXA0f1vywAxYKGl/KCcBBGZlRB2nhGAY9+2NufoX3Ke
+9//Jl/UTsUycsmo8alAswNWRqM/i0y3kuq6qH4zkOhWX6ogj3FFid8P5RfXyos+7
+BITyecVc7bX/VMJc9CvNbih81p7yrAKwSvmNwzdJ4+iBT1NUX+V4gqI0q5Myzckg
+1JT2zfhH+6r5LqKDP6BrXKOhrNYd1A8WIX6cvqQHdafgIZ3CpaQ=
+=IuCX
+-----END PGP SIGNATURE-----
--- a/akonadi-server.changes
+++ b/akonadi-server.changes
@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Mon Apr 18 07:50:33 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 22.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/22.04.0/
+
+-------------------------------------------------------------------
+Fri Apr  8 18:16:43 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 22.03.90
+  * New feature release
+
+-------------------------------------------------------------------
+Wed Mar 23 08:13:24 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 22.03.80
+  * New feature release
+- Changes since 21.12.3:
+  * Apparmor: Also look in /usr/libexec
+  * Fix some qt6 compile error
+  * Fix compile without deprecated method
+  * Make it compile against qt6
+  * Fix install private includes (qt6 compile fix)
+  * Fix cmake variable
+  * Show missing header in qtc6
+  * Fix some qtc6 compile error
+  * Check executables exist in PATH before passing them to QProcess
+  * kaccounts-integration is Linux/FreeBSD only - so don't try to use it elsewhere
+  * Remove kplugindesigner dep
+  * Fix build with GCC 12 (standard attributes in middle of decl-specifiers)
+  * Fix compile error against qt6
+  * Change build system for building against qt6
+  * Remove dependence on Boost
+  * Update postgres paths
+  * Fix brackets issue
+  * Use capturedView directly
+  * Enable new CI on FreeBSD
+  * Switch to new GitLab CI tooling
+  * Fix kaccounts-integration dep
+  * Fix warning
+  * Port deprecated I18N_NOOP macro
+- Drop patch, now upstream:
+  * akonadi-server/0001-Apparmor-Also-look-in-usr-libexec.patch
+
 -------------------------------------------------------------------
 Fri Mar 11 10:38:21 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

--- 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 released
 Name:           akonadi-server
-Version:        21.12.3
+Version:        22.04.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
-Patch0:         0001-Apparmor-Also-look-in-usr-libexec.patch
 BuildRequires:  apparmor-abstractions
 BuildRequires:  apparmor-rpm-macros
 BuildRequires:  extra-cmake-modules >= %{kf5_version}
@ -251,11 +249,11 @@ This package contains AppArmor profiles for Akonadi.
 %{_kf5_bindir}/akonadi2xml
 %{_kf5_cmakedir}/KF5Akonadi
 %{_kf5_dbusinterfacesdir}/org.freedesktop.Akonadi.*.xml
+%{_kf5_includedir}/Akonadi/
 %{_kf5_includedir}/AkonadiAgentBase/
 %{_kf5_includedir}/AkonadiCore/
 %{_kf5_includedir}/AkonadiWidgets/
 %{_kf5_includedir}/AkonadiXml/
-%{_kf5_includedir}/akonadi/
 %{_kf5_includedir}/akonadi_version.h
 %{_kf5_libdir}/libKF5AkonadiAgentBase.so
 %{_kf5_libdir}/libKF5AkonadiCore.so
@ -267,8 +265,6 @@ This package contains AppArmor profiles for Akonadi.
 %{_kf5_mkspecsdir}/qt_AkonadiWidgets.pri
 %{_kf5_mkspecsdir}/qt_AkonadiXml.pri
 %{_kf5_plugindir}/designer/
-%dir %{_kf5_sharedir}/kdevappwizard/
-%{_kf5_sharedir}/kdevappwizard/templates/

 %files apparmor
 %config(noreplace) %{_sysconfdir}/apparmor.d/mariadbd_akonadi