From c7568cfa3402daa8185b3074306d788edcb93af6353d8ac8b16dacf73e53e985 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 17 Nov 2022 22:57:58 +0000 Subject: [PATCH] Accepting request 1035766 from home:cgiboudeaux:applications-22.11.80 KDE release gear 22.12 beta. Don't forward OBS-URL: https://build.opensuse.org/request/show/1035766 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=325 --- akonadi-22.08.3.tar.xz | 3 --- akonadi-22.08.3.tar.xz.sig | 16 --------------- akonadi-22.11.80.tar.xz | 3 +++ akonadi-22.11.80.tar.xz.sig | 16 +++++++++++++++ akonadi-server.changes | 6 ++++++ akonadi-server.spec | 40 ++++++++++++++----------------------- 6 files changed, 40 insertions(+), 44 deletions(-) delete mode 100644 akonadi-22.08.3.tar.xz delete mode 100644 akonadi-22.08.3.tar.xz.sig create mode 100644 akonadi-22.11.80.tar.xz create mode 100644 akonadi-22.11.80.tar.xz.sig diff --git a/akonadi-22.08.3.tar.xz b/akonadi-22.08.3.tar.xz deleted file mode 100644 index 88ae81c..0000000 --- a/akonadi-22.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2ba2284f440e7c2dc150b763d84029bd92a96176ad0214dd30bda1d81309974 -size 1631348 diff --git a/akonadi-22.08.3.tar.xz.sig b/akonadi-22.08.3.tar.xz.sig deleted file mode 100644 index 56fbfce..0000000 --- a/akonadi-22.08.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmNgZMMACgkQu0YzUNbv -Me8jlA/+Jdbd2ld1fBIhrHHbMRq527gsxA8TDobOfWqsmfJCbeqLbse63k0Ivwpp -SfciIKSkUdNNKdQWGZ05Q3X/Ej52Q9sZ7835F92Yvg/egKx4cqZ25zkBzk15+xz+ -pVueJfMsasoSSyNvAujjh3Kyj51xEciMVp288is4Z6phqMS5nbexcEGLYNeFoKkL -YS8LQi475XxrDz8UF0HYdx0zkNVIn0eRjvWiWb4MZCsiCOPlt9tWoncs1jmxQQBZ -edC0TfBZ0m/6YcZjDdRPxBo7cI5v3lj1Z4UidxOyr/g7g4iN/OjR+jzXr8E6B7AC -I2CJB9ZfrvS2WmTHdASQYKCSIvpGfSckUpPXw95tlbRS+46XIgPUbB8Dn8DSinvu -TAFwZqXhyPObKOAjyTZ1QZx9f3rf4WdHRimPGmFnHQz8fPzQfgDOWJphhzfPqOQR -WnFspLr9Yr3EuogFEojcTbXHwMpwCOS8Gxw1OiCIRraVfxhkcq44sShH4+42BLQ8 -a0aT0xWUaE7c7XXFdG/vcOQeiQWsUhNnkgySh5et0hzgfpsd6/VvTkAFZCvx3WBL -D2TWpiSsE6WkpGB8aaBuHcjrjwUEaBYUi5PzuREo9ArZj33qMfZZKcQFobCVmoHr -Zci7BF/ciH9qhY2oYSuWpnFO16/q9yAeO3uem6hyQaJyrSjlfYw= -=8aHu ------END PGP SIGNATURE----- diff --git a/akonadi-22.11.80.tar.xz b/akonadi-22.11.80.tar.xz new file mode 100644 index 0000000..dd8a5e8 --- /dev/null +++ b/akonadi-22.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf3aef2babc7264d7a0830c191e4e9917d027974ca0ae6463c81485e899d5087 +size 1657092 diff --git a/akonadi-22.11.80.tar.xz.sig b/akonadi-22.11.80.tar.xz.sig new file mode 100644 index 0000000..7e029ec --- /dev/null +++ b/akonadi-22.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmNtkzQACgkQOmpNuDnq +ptfNYw/9FudTLaHAkVGJ8nkhQHpdyEWRjBacmWewgoz+zNwWPdju/zQsKzu64pGU +Vov0b18ktTKVf7funmLlx9RPZz4iilRiu0rUizxznTyAL7iB7m1YYcahNIINeu2o +YY2hBpAfPUKOeqSLRcDYvGK6fXwTqNw9eq8bhoX+mLVGk+xxSqF6hXoGbIkZIoLM +NhJzgkdK6xE0di2UyAdLxKBiPnkYdGjVsafov5zQwHrPOIt5veFIA2G/1f+LbkuX +XAzojLb9jCsgSmtAPOtz/4PyxVW32i9nAb/rAGCqvGRLUa5TbBgV73Ttxu0POipd +hk4aFc5qL5fwP0g4G6ov2hcWRTe7ysHg7FJ/QOETzdv6RWPPR2d7Hzzlxx/M4REq +nd55GZxbQlvGTh0kkuW1m146u3H0x+9I/gvDbuBCVV3iTp8G2qApwjmu4zDRySxb +FNsKRTGIoXHPf7DKPWtqJKlBiuKSVNmAdKOzkK+RgkM7uH1Hto15RUIEMayC1fLL +DoJhAUmkhv4fLQlj6QTV3SHyGnNP/kGChmmvWtia6WPeFiJ9jWEM01do/Dn4kKi0 +bMXeR8e8d6T5vvLHEnOaBMmbsUX+DkvrPjZMUz1VGBF/y1EivXK9J/OlH+oN2dH9 +jE49QpAgBBV1OUKGY8CocJQgW0bbp5wFlgXSfL+07NY0NJUdpkc= +=jQh1 +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index aa2415f..705259a 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 12 08:53:13 UTC 2022 - Christophe Giboudeaux + +- Update to 22.11.80 + * New feature release + ------------------------------------------------------------------- Tue Nov 1 11:19:36 UTC 2022 - Christophe Giboudeaux diff --git a/akonadi-server.spec b/akonadi-server.spec index 74658e6..c19dc5e 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -17,20 +17,19 @@ %define rname akonadi -%define kf5_version 5.79.0 +%define kf5_version 5.99.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 released Name: akonadi-server -Version: 22.08.3 +Version: 22.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 %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 @@ -70,11 +69,8 @@ BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) -Requires: ((akonadi-server-sqlite or (libqt5-sql-mysql and mysql)) if branding-SLE) -Requires: (libqt5-sql-mysql or branding-SLE) -Requires: (mysql or branding-SLE) -Recommends: libqt5-sql-mysql -Recommends: mysql +Requires: libqt5-sql-mysql +Requires: mysql # FIXME: Check if it's worth it Recommends: kaccounts-integration Recommends: kaccounts-providers @@ -91,7 +87,6 @@ service. %package -n libKF5AkonadiCore5 Summary: Core Akonadi Server library -Group: System/Libraries Recommends: %{name} %description -n libKF5AkonadiCore5 @@ -99,7 +94,6 @@ This package includes the core Akonadi library, the KDE PIM storage service. %package -n libKF5AkonadiAgentBase5 Summary: Akonadi Agent base library -Group: System/Libraries Recommends: %{name} %description -n libKF5AkonadiAgentBase5 @@ -107,7 +101,6 @@ This package includes the agent library for Akonadi, the KDE PIM storage service %package -n libKF5AkonadiWidgets5 Summary: Akonadi Agent base library -Group: System/Libraries Recommends: %{name} %description -n libKF5AkonadiWidgets5 @@ -115,7 +108,6 @@ This package provides the basic GUI widgets for Akonadi, the KDE PIM storage ser %package -n libKF5AkonadiPrivate5 Summary: Akonadi Private Server library -Group: System/Libraries Recommends: %{name} %description -n libKF5AkonadiPrivate5 @@ -123,7 +115,6 @@ This package includes the Private Akonadi library for Akonadi, the KDE PIM stora %package -n libKF5AkonadiXml5 Summary: Akonadi Xml library -Group: System/Libraries Recommends: %{name} %description -n libKF5AkonadiXml5 @@ -131,7 +122,6 @@ This package includes the Akonadi Xml library for Akonadi, the KDE PIM storage s %package sqlite Summary: akonadi server's SQlite plugin -Group: System/GUI/KDE Requires: %{name} = %{version} Supplements: (%{name} and sqlite3) @@ -140,7 +130,6 @@ Akonadi server's SQlite plugin. %package devel Summary: Akonadi Framework: Build Environment -Group: Development/Libraries/X11 Requires: %{name} = %{version} Requires: libKF5AkonadiAgentBase5 = %{version} Requires: libKF5AkonadiCore5 = %{version} @@ -180,14 +169,13 @@ This package contains AppArmor profiles for Akonadi. %autosetup -p1 -n %{rname}-%{version} %build - %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} - %cmake_build +%cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} +%cmake_build %install - %kf5_makeinstall -C build - %if %{with released} - %find_lang %{name} --with-man --all-name - %endif +%kf5_makeinstall -C build + +%find_lang %{name} --with-man --all-name %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -251,6 +239,8 @@ This package contains AppArmor profiles for Akonadi. %{_kf5_plugindir}/sqldrivers/ %files devel +%dir %{_kf5_sharedir}/kdevappwizard +%dir %{_kf5_sharedir}/kdevappwizard/templates %{_kf5_bindir}/akonadi2xml %{_kf5_cmakedir}/KF5Akonadi %{_kf5_dbusinterfacesdir}/org.freedesktop.Akonadi.*.xml @@ -269,6 +259,8 @@ This package contains AppArmor profiles for Akonadi. %{_kf5_mkspecsdir}/qt_AkonadiWidgets.pri %{_kf5_mkspecsdir}/qt_AkonadiXml.pri %{_kf5_plugindir}/designer/ +%{_kf5_sharedir}/kdevappwizard/templates/akonadiresource.tar.bz2 +%{_kf5_sharedir}/kdevappwizard/templates/akonadiserializer.tar.bz2 %files apparmor %config(noreplace) %{_sysconfdir}/apparmor.d/mariadbd_akonadi @@ -276,8 +268,6 @@ This package contains AppArmor profiles for Akonadi. %config(noreplace) %{_sysconfdir}/apparmor.d/postgresql_akonadi %config(noreplace) %{_sysconfdir}/apparmor.d/usr.bin.akonadiserver -%if %{with released} %files lang -f %{name}.lang -%endif %changelog