diff --git a/akonadi-22.08.0.tar.xz b/akonadi-22.08.0.tar.xz deleted file mode 100644 index 1501d8b..0000000 Binary files a/akonadi-22.08.0.tar.xz and /dev/null differ diff --git a/akonadi-22.12.0.tar.xz b/akonadi-22.12.0.tar.xz new file mode 100644 index 0000000..fbfc0fd Binary files /dev/null and b/akonadi-22.12.0.tar.xz differ diff --git a/kf5-akonadi-server.spec b/kf5-akonadi-server.spec index 9e594ae..8cbb398 100644 --- a/kf5-akonadi-server.spec +++ b/kf5-akonadi-server.spec @@ -1,41 +1,36 @@ - %global framework akonadi-server - %global mysql mysql -# bootstrap mode -%global bootstrap 1 - +# uncomment to enable bootstrap mode +# global bootstrap 1 %if !0%{?bootstrap} -# skip slow(er) archs -%ifnarch %{arm} riscv64 +# skip slow(er) archs, for now -- rex +%ifnarch %{arm} s390x %global tests 0 %endif %endif Name: kf5-%{framework} Summary: PIM Storage Service -Version: 22.08.0 +Version: 22.12.0 Release: 1 License: LGPLv2+ URL: https://invent.kde.org/frameworks/%{framework} +Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/akonadi-%{version}.tar.xz +Source10: akonadiserverrc.mysql +Source11: akonadiserverrc.sqlite +%define mysql_conf_timestamp 20170512 %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/akonadi-%{version}.tar.xz -Source10: akonadiserverrc.mysql -Source11: akonadiserverrc.sqlite - -%define mysql_conf_timestamp 20170512 BuildRequires: extra-cmake-modules >= 5.60 BuildRequires: kf5-rpm-macros BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtxmlpatterns-devel BuildRequires: cmake(KF5ItemViews) @@ -59,21 +54,20 @@ BuildRequires: iptables-libs %global majmin_ver %(echo %{version} | cut -d. -f1,2) -## optional deps %if ! 0%{?bootstrap} BuildRequires: pkgconfig(Qt5Designer) BuildRequires: cmake(KF5DesignerPlugin) -BuildRequires: cmake(AccountsQt5) +BuildRequires: libaccounts-qt5-devel BuildRequires: cmake(KAccounts) BuildRequires: kaccounts-integration-devel %endif # sqlite3 driver plugin needs versioned qt5 dep BuildRequires: qt5-qtbase-private-devel -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +%{?_qt5:Requires: %{_qt5} = %{_qt5_version}} -# backends -# In the future use cmake(xxx) instead of these +# backends, used at buildtime to query known locations of server binaries +# FIXME/TODO: set these via cmake directives, avoids needless buildroot items BuildRequires: mariadb-server BuildRequires: postgresql-server @@ -88,8 +82,13 @@ Requires(postun): %{_sbindir}/update-alternatives Recommends: %{name}-mysql = %{version}-%{release} Conflicts: akonadi < 1.13.0-100 + +# translations moved here Conflicts: kde-l10n < 17.03 +# when kf5-akonadi was split, -socialutils was dropped +Obsoletes: kf5-akonadi-socialutils < 16.07 + %description %{summary}. @@ -97,7 +96,7 @@ Conflicts: kde-l10n < 17.03 Summary: Developer files for %{name} Obsoletes: kf5-akonadi-devel < 16.03 Obsoletes: kf5-akonadi-socialutils-devel < 16.07 -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: boost-devel Requires: kf5-kcompletion-devel Requires: kf5-kjobwidgets-devel @@ -107,7 +106,6 @@ Requires: kf5-kxmlgui-devel Requires: kf5-kitemmodels-devel Requires: qt5-qtbase-devel Conflicts: akonadi-devel - %description devel %{summary}. @@ -116,15 +114,14 @@ Summary: Akonadi MySQL backend support Obsoletes: akonadi < 1.7.90-2 Obsoletes: akonadi-mysql < 15.08.0 Provides: akonadi-mysql = %{version}-%{release} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: %{mysql}-server %if "%{?mysql}" != "mariadb" Recommends: mariadb-server %endif -Requires: qt5-qtbase-mysql%{?_isa} +Requires: qt5-qtbase-mysql Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives - %description mysql Configures akonadi to use mysql backend by default. @@ -137,7 +134,6 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf %prep %autosetup -n akonadi-%{version} -p1 - %build mkdir %{_target_platform} pushd %{_target_platform} @@ -148,7 +144,6 @@ pushd %{_target_platform} popd %make_build -C %{_target_platform} - %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} @@ -165,18 +160,20 @@ touch -d %{mysql_conf_timestamp} \ %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-global*.conf \ %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-local.conf +# create/own these dirs mkdir -p %{buildroot}%{_kf5_datadir}/akonadi/plugins mkdir -p %{buildroot}%{_kf5_libdir}/akonadi +# %%ghost'd global akonadiserverrc touch akonadiserverrc install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc +## unpackaged files # omit mysql-global-mobile.conf rm -fv %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf -# part of omitting exceptions header hack, drop the custom header +# part of omitting exceptions header hack, drop the custom (no-longer-used) header itself rm -fv %{buildroot}%{_kf5_includedir}/AkonadiCore/std_exception.h - %check %if 0%{?tests} export CTEST_OUTPUT_ON_FAILURE=1 @@ -185,7 +182,6 @@ dbus-launch --exit-with-session \ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %endif - %post %{?ldconfig} %{_sbindir}/update-alternatives \ @@ -202,7 +198,6 @@ if [ $1 -eq 0 ] ; then %{_sysconfdir}/xdg/akonadi/akonadiserverrc.sqlite fi - %files -f libakonadi5.lang %doc AUTHORS %doc README* @@ -253,6 +248,8 @@ fi %{_kf5_libdir}/cmake/KF5Akonadi/ %{_kf5_archdatadir}/mkspecs/modules/qt_Akonadi*.pri %{_kf5_qtplugindir}/pim5/akonadi/akonadi_test_searchplugin.so +%{_kf5_datadir}/kdevappwizard/templates/akonadiresource.tar.bz2 +%{_kf5_datadir}/kdevappwizard/templates/akonadiserializer.tar.bz2 %post mysql %{_sbindir}/update-alternatives \ @@ -273,7 +270,9 @@ fi %config(noreplace) %{_sysconfdir}/xdg/akonadi/mysql-global.conf %config(noreplace) %{_sysconfdir}/xdg/akonadi/mysql-local.conf - %changelog +* Mon Apr 24 2023 jiangxinyu - 22.12.0-1 +- Update package to version 22.12.0 + * Wed Jul 27 2022 misaka00251 - 22.08.0-1 - Init package