From 39261b8db01ea34605221ec579c189899e8f53c3584bec863a7f324c6ccbf0e6 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Mon, 20 Mar 2023 08:51:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=335 --- akonadi-22.12.3.tar.xz | 3 - akonadi-22.12.3.tar.xz.sig | 16 ------ akonadi-23.03.80.tar.xz | 3 + akonadi-23.03.80.tar.xz.sig | 16 ++++++ akonadi-server.changes | 6 ++ akonadi-server.spec | 110 ++++++++++++++++++------------------ 6 files changed, 81 insertions(+), 73 deletions(-) delete mode 100644 akonadi-22.12.3.tar.xz delete mode 100644 akonadi-22.12.3.tar.xz.sig create mode 100644 akonadi-23.03.80.tar.xz create mode 100644 akonadi-23.03.80.tar.xz.sig diff --git a/akonadi-22.12.3.tar.xz b/akonadi-22.12.3.tar.xz deleted file mode 100644 index a7e2866..0000000 --- a/akonadi-22.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b79e332628e1e8041a39aaa3821f1b9235c0a2332ea9b1ff7fba73855bce80a3 -size 1661668 diff --git a/akonadi-22.12.3.tar.xz.sig b/akonadi-22.12.3.tar.xz.sig deleted file mode 100644 index 48f8cda..0000000 --- a/akonadi-22.12.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmP9R7kACgkQu0YzUNbv -Me8f8w//QArF2/A+FrobZVK6VdyWCVrfs/UoaAC79EPJhk4kZQEsciYpVAvGALSL -7EMxgdIiOvT0NcoQnrRcYoKgCRlCiJglidpctQxKtSh2Kiab0IztY4GUdAJLMTd4 -RVY5Y7vkFf6yAV9gjOaLtL0xoCcDwdU2YZbVLKdO2R1ZZDtmJKVAbFfP1AkLgXUO -Eed5O8x1m8z+JDG1VUueBYgW4JyjEMREd+k2j7IvyHp7FvfCy4r3IDZlKYL+1Tm4 -ibzDzHRsnnyp4iMCgbkcvhQnp9J4wWqoOn68av9OSRMhFWlpNUJR8wOE/u64Z6F2 -ScRFKF0f0mT/aPHEtmWsz4kR9R5QA6XI2wr2FS6oszl3mSWyF99Rh01LHPg91eH8 -1TQdWzfw9N1IRa1HPJF/Ni+rIx3YqCU0TN3fJLcQ5xfZm8sbMZvGHKFNWF0X1VrP -ZTbeMONqRxWrHOM+ymMKBy556Y55Azg/8uD7dqiTannj0ILhF42J4dUcbACYGQXe -1txyknTLi3XyNMZ4+/yhwmZOdVcufau2f1iNKX8jSQiHUPs3Ju5Xi6sbRPXk8jLo -H5He3vZ5bkif4n57siHlE2ukmmFwp3J6L/PMkQh+qpq2uXXR7syVmeREysXB3lRZ -dXm7TKExLk85m9KytArqXonUtbab1nmkYMwu7d/CgC+yESTM1IY= -=s8NE ------END PGP SIGNATURE----- diff --git a/akonadi-23.03.80.tar.xz b/akonadi-23.03.80.tar.xz new file mode 100644 index 0000000..1b68bb9 --- /dev/null +++ b/akonadi-23.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64237e733a6f6ebfa39ca8a8ec54593df703db133629398cf03591e5f3db5034 +size 1667956 diff --git a/akonadi-23.03.80.tar.xz.sig b/akonadi-23.03.80.tar.xz.sig new file mode 100644 index 0000000..1662b93 --- /dev/null +++ b/akonadi-23.03.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmQUG54ACgkQOmpNuDnq +ptcHzQ//ZWtKFi8U6lhdrqHKFQOraki5zKBhjCAf+ix6J0wHIoIPvz8hYiHIqMS0 +swZ8X+RKlhfTWrrRI9s5bUh//gw+H0FLPZAz8uGYhOLtI0iawWLk0+r9mPQwngz2 +oD4tNq1vqsSOqAF3zgGwdhtW24+aB8JJ9gU8+OkN7qwjelq0HIQZ96z19ubxH4Q7 +Olrq9BmH5MeUhJdI4zE5nqvlJAVAqwo6OABtdbJvFVKlXlRRDhGB8sKEqmRPPEMK +vRaWYh/Ve6KSNK9sUDWNjl8C4UrxK+AH/hauGzrrbCIVDi+p0CPqXS9KmZ+wVqDy +2NvCDzc/5XQwENsgYPPXKDU3+eNddFmnEM6uIidnqY3fOKrR49S2X5zFrW6FAX1+ +ihozRd06XKJTSca8Nt3V0dg1KR43BJh2Z7Ql5ESDGisNEBea4tH9IuUD9BRJOIAL +Ox4qJ1ZajihWqzIr3kWjxNyPempLj+RObiwcnbHM8n4uMxUWDkffVC7U5/CfDwNw +3/ZQlRW1beoqmWOu63oO6DoqdAJyh7clrVB9NF9yYh+MLw03eUQy0kHE27bDkL7Z ++EOCI2ITm9pJggzvX27FX11Q+oJLqk5qoGiXPm9bI1hliTppPC1zWnb6p03Gp09Y +YL83gNlxcAVeMuC5HC7QGiZjuYJ6BmUJJsZD0Bqg5Sa0ddnSh14= +=HaOl +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index 93bb399..f09ec0d 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 17 20:42:45 UTC 2023 - Christophe Marin + +- Update to 23.03.80 + * New feature release + ------------------------------------------------------------------- Tue Feb 28 09:45:19 UTC 2023 - Christophe Marin diff --git a/akonadi-server.spec b/akonadi-server.spec index 529d957..12fd0d8 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -17,19 +17,17 @@ %define rname akonadi -%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}')} +%define kf5_version 5.104.0 %bcond_without released Name: akonadi-server -Version: 22.12.3 +Version: 23.03.80 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later 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 @@ -38,8 +36,6 @@ BuildRequires: apparmor-rpm-macros BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel -BuildRequires: libboost_graph-devel -BuildRequires: libboost_headers-devel BuildRequires: libxml2-tools BuildRequires: libxslt-tools BuildRequires: mariadb @@ -47,16 +43,13 @@ BuildRequires: postgresql-devel BuildRequires: shared-mime-info BuildRequires: sqlite3-devel BuildRequires: cmake(KAccounts) -BuildRequires: cmake(KF5Completion) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5ItemViews) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5WindowSystem) @@ -71,7 +64,6 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) Requires: libqt5-sql-mysql Requires: mysql -# FIXME: Check if it's worth it Recommends: kaccounts-integration Recommends: kaccounts-providers Suggests: mariadb @@ -85,39 +77,49 @@ Obsoletes: akonadi-runtime < %{version} This package contains the data files of Akonadi, the KDE PIM storage service. -%package -n libKF5AkonadiCore5 +%package -n libKPim5AkonadiCore5 Summary: Core Akonadi Server library Recommends: %{name} +Provides: libKF5AkonadiCore5 = %{version} +Obsoletes: libKF5AkonadiCore5 < %{version} -%description -n libKF5AkonadiCore5 +%description -n libKPim5AkonadiCore5 This package includes the core Akonadi library, the KDE PIM storage service. -%package -n libKF5AkonadiAgentBase5 +%package -n libKPim5AkonadiAgentBase5 Summary: Akonadi Agent base library Recommends: %{name} +Provides: libKF5AkonadiAgentBase5 = %{version} +Obsoletes: libKF5AkonadiAgentBase5 < %{version} -%description -n libKF5AkonadiAgentBase5 +%description -n libKPim5AkonadiAgentBase5 This package includes the agent library for Akonadi, the KDE PIM storage service. -%package -n libKF5AkonadiWidgets5 +%package -n libKPim5AkonadiWidgets5 Summary: Akonadi Agent base library Recommends: %{name} +Provides: libKF5AkonadiWidgets5 = %{version} +Obsoletes: libKF5AkonadiWidgets5 < %{version} -%description -n libKF5AkonadiWidgets5 +%description -n libKPim5AkonadiWidgets5 This package provides the basic GUI widgets for Akonadi, the KDE PIM storage service. -%package -n libKF5AkonadiPrivate5 +%package -n libKPim5AkonadiPrivate5 Summary: Akonadi Private Server library Recommends: %{name} +Provides: libKF5AkonadiPrivate5 = %{version} +Obsoletes: libKF5AkonadiPrivate5 < %{version} -%description -n libKF5AkonadiPrivate5 +%description -n libKPim5AkonadiPrivate5 This package includes the Private Akonadi library for Akonadi, the KDE PIM storage service. -%package -n libKF5AkonadiXml5 +%package -n libKPim5AkonadiXml5 Summary: Akonadi Xml library Recommends: %{name} +Provides: libKF5AkonadiXml5 = %{version} +Obsoletes: libKF5AkonadiXml5 < %{version} -%description -n libKF5AkonadiXml5 +%description -n libKPim5AkonadiXml5 This package includes the Akonadi Xml library for Akonadi, the KDE PIM storage service. %package sqlite @@ -131,11 +133,9 @@ Akonadi server's SQlite plugin. %package devel Summary: Akonadi Framework: Build Environment Requires: %{name} = %{version} -Requires: libKF5AkonadiAgentBase5 = %{version} -Requires: libKF5AkonadiCore5 = %{version} -Requires: libKF5AkonadiWidgets5 = %{version} -Requires: libboost_headers-devel -Requires: cmake(KF5Completion) +Requires: libKPim5AkonadiAgentBase5 = %{version} +Requires: libKPim5AkonadiCore5 = %{version} +Requires: libKPim5AkonadiWidgets5 = %{version} Requires: cmake(KF5Config) Requires: cmake(KF5ConfigWidgets) Requires: cmake(KF5CoreAddons) @@ -149,8 +149,8 @@ Requires: cmake(Qt5Widgets) Requires: cmake(Qt5Xml) Conflicts: libakonadiprotocolinternals-devel Obsoletes: akonadi-devel < %{version} -Obsoletes: libKF5AkonadiPrivate-devel < %{version} Provides: libKF5AkonadiPrivate-devel = %{version} +Obsoletes: libKF5AkonadiPrivate-devel < %{version} %description devel This package contains development files of Akonadi, the KDE PIM storage @@ -179,11 +179,11 @@ This package contains AppArmor profiles for Akonadi. %ldconfig_scriptlets -%ldconfig_scriptlets -n libKF5AkonadiWidgets5 -%ldconfig_scriptlets -n libKF5AkonadiCore5 -%ldconfig_scriptlets -n libKF5AkonadiAgentBase5 -%ldconfig_scriptlets -n libKF5AkonadiPrivate5 -%ldconfig_scriptlets -n libKF5AkonadiXml5 +%ldconfig_scriptlets -n libKPim5AkonadiWidgets5 +%ldconfig_scriptlets -n libKPim5AkonadiCore5 +%ldconfig_scriptlets -n libKPim5AkonadiAgentBase5 +%ldconfig_scriptlets -n libKPim5AkonadiPrivate5 +%ldconfig_scriptlets -n libKPim5AkonadiXml5 %post apparmor %apparmor_reload %{_sysconfdir}/apparmor.d/mariadbd_akonadi %{_sysconfdir}/apparmor.d/mysqld_akonadi %{_sysconfdir}/apparmor.d/postgresql_akonadi %{_sysconfdir}/apparmor.d/usr.bin.akonadiserver @@ -213,41 +213,43 @@ This package contains AppArmor profiles for Akonadi. %{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service %{_kf5_sharedir}/mime/packages/akonadi-mime.xml -%files -n libKF5AkonadiAgentBase5 -%{_kf5_libdir}/libKF5AkonadiAgentBase.so.* +%files -n libKPim5AkonadiAgentBase5 +%{_kf5_libdir}/libKPim5AkonadiAgentBase.so.* -%files -n libKF5AkonadiCore5 +%files -n libKPim5AkonadiCore5 %license LICENSES/* -%{_kf5_libdir}/libKF5AkonadiCore.so.* +%{_kf5_libdir}/libKPim5AkonadiCore.so.* -%files -n libKF5AkonadiWidgets5 -%{_kf5_libdir}/libKF5AkonadiWidgets.so.* +%files -n libKPim5AkonadiWidgets5 +%{_kf5_libdir}/libKPim5AkonadiWidgets.so.* -%files -n libKF5AkonadiPrivate5 -%{_kf5_libdir}/libKF5AkonadiPrivate.so.* +%files -n libKPim5AkonadiPrivate5 +%{_kf5_libdir}/libKPim5AkonadiPrivate.so.* -%files -n libKF5AkonadiXml5 -%{_kf5_libdir}/libKF5AkonadiXml.so.* +%files -n libKPim5AkonadiXml5 +%{_kf5_libdir}/libKPim5AkonadiXml.so.* %files sqlite %{_kf5_plugindir}/sqldrivers/ %files devel +%dir %{_includedir}/KPim5 %dir %{_kf5_sharedir}/kdevappwizard %dir %{_kf5_sharedir}/kdevappwizard/templates +%{_includedir}/KPim5/Akonadi/ +%{_includedir}/KPim5/AkonadiAgentBase/ +%{_includedir}/KPim5/AkonadiCore/ +%{_includedir}/KPim5/AkonadiWidgets/ +%{_includedir}/KPim5/AkonadiXml/ %{_kf5_bindir}/akonadi2xml -%{_kf5_cmakedir}/KF5Akonadi +%{_kf5_cmakedir}/KF5Akonadi/ +%{_kf5_cmakedir}/KPim5Akonadi/ %{_kf5_dbusinterfacesdir}/org.freedesktop.Akonadi.*.xml -%{_kf5_includedir}/Akonadi/ -%{_kf5_includedir}/AkonadiAgentBase/ -%{_kf5_includedir}/AkonadiCore/ -%{_kf5_includedir}/AkonadiWidgets/ -%{_kf5_includedir}/AkonadiXml/ -%{_kf5_libdir}/libKF5AkonadiAgentBase.so -%{_kf5_libdir}/libKF5AkonadiCore.so -%{_kf5_libdir}/libKF5AkonadiPrivate.so -%{_kf5_libdir}/libKF5AkonadiWidgets.so -%{_kf5_libdir}/libKF5AkonadiXml.so +%{_kf5_libdir}/libKPim5AkonadiAgentBase.so +%{_kf5_libdir}/libKPim5AkonadiCore.so +%{_kf5_libdir}/libKPim5AkonadiPrivate.so +%{_kf5_libdir}/libKPim5AkonadiWidgets.so +%{_kf5_libdir}/libKPim5AkonadiXml.so %{_kf5_mkspecsdir}/qt_AkonadiAgentBase.pri %{_kf5_mkspecsdir}/qt_AkonadiCore.pri %{_kf5_mkspecsdir}/qt_AkonadiWidgets.pri