diff --git a/akonadi-23.04.3.tar.xz b/akonadi-23.04.3.tar.xz deleted file mode 100644 index e028744..0000000 --- a/akonadi-23.04.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b53d72291c6cfb692f0683a3a089b2294adeb8f9d0794b2c174d15c5a48f74a -size 1668012 diff --git a/akonadi-23.04.3.tar.xz.sig b/akonadi-23.04.3.tar.xz.sig deleted file mode 100644 index 58df3dc..0000000 --- a/akonadi-23.04.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmSjs4gACgkQu0YzUNbv -Me9evA/8DL0L+3SVgpmc4rfV1jLlAyoiCkGwCe8nif/E4VO/bntK7+vWOef9OaD8 -6UgpCaV8lOjDiXT24cRAOib3+raGSoMdj5ANzvkZNa1Gk71/fh6sx91QQFQEBV41 -VyhKbOlMr1zQf1y9m33BUR0KE0BbL3AdCbpVfKEv/WyBcFGrr4ivGXVhL46QJ8tP -sV5qTfBG6tR+qiLo+e/GmPqxC/wPt3n4vSomvEZuc8KfQeh+qH6RagGeqVa1z9lE -ZBG0W/bm0D9aH1FO961uV7afuzQm11gkwShl0YSLwjXKNb6LFiNRO1GvjYixmIBD -uM8D0iAtUBViNdRGkOdajwM7Zl6jEzQWb2XWlRwMXyvyN7H8e79d/L4EWguuoZgG -N225/Od7jo4aQfAVafjDLQGp0EgHYQvWnP7z8R9FWXVbbVfH5IZTv4uPUjUmiY47 -JDuDFqfXJbrHr5GjOFZUXaerw6wEGbH3FWkQJTfqLs+ZsCk0HoPJP7L0jbvXGRsv -OyLx+rTliPCVvmqyJIW4OKjw0YntH3OJgdBpoDb2TurukjuzWYGwrjzKO5Ix8uvg -lTtRUIis8Ea4xiZtjsTGsa0S8QLYydB0mmDCX+ex4O6Dmp2AiE7DtlYDYdqDfPo6 -8sOXXCh3zGjFc+VlD+JzOWYv+wsVCSMJNMpwrVI5K9YPJzDwKyI= -=w9XH ------END PGP SIGNATURE----- diff --git a/akonadi-23.07.90.tar.xz b/akonadi-23.07.90.tar.xz new file mode 100644 index 0000000..22a1ec1 --- /dev/null +++ b/akonadi-23.07.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50fe471f877e338b9e01f0672963531946e5ca87c2279afe95dea065aace857c +size 1662172 diff --git a/akonadi-23.07.90.tar.xz.sig b/akonadi-23.07.90.tar.xz.sig new file mode 100644 index 0000000..2b5dacd --- /dev/null +++ b/akonadi-23.07.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmTVS4cACgkQOmpNuDnq +ptcupBAAihn8C4e/Ewht0lBh1re4htu0sHETivEX6DRbTUU65E9m2iBnhFN3BMb5 +b7q9K7RxsAHBQ1+CXnl/u/2Rlh4b+Jofb8aL5v8QEQwm5N77dRttLpQ7t/oGbh5M +6dRuRCihOSewIfJbUpU5pBoqLaGm0pBToSFSp14sVm7+eDjgyOArebDU35mGCkH+ +dSWgu6D6AKoJIEIqH6UDM1gqxOTnG1AZyhxAQsrvaTMqjF23+ObbNGwHV5bqvQ3L +Gwjkq7q7HG9jpJAx7JCWpPwTyes+SSdX2ZDdQb/wCi9Au1mnhOrHv2JJL4j0R9fZ +5iZQfcTW7QdTMwmkKf2eir4ayPHvAjMVUS9qU8bBz4eHR6GQJ62TMqoaFclUC/if +1r+O3qWNjdDF6wQXJXJ5pDQMt2LJFmdRei1vRMZdWsslj7yCUiA8Hg9B2gswRio/ +pgIXjneY/N5EWC5IOyFgKQQ6eIpKHCNRn6qG4Ow5crYH+k6cbK6rBboCizGW6bnJ +UMCkaPXMOT+8QkJMLm1q2XIXi5XvdtBFWyA5FMwxdv8L+6oh3w4eK1CSQNPFisoa +GO4OHZk36xt5j5M75TkBfcUtc8jLgkGkaq/AEdOles6v9+lcVoG2ucQafrPMMEUP +z5FV7+SEzNPU2I2o4DDDUISdG2aRhdamIkwB81X1r8Z3Gydm+Ec= +=cdbL +-----END PGP SIGNATURE----- diff --git a/akonadi-server.changes b/akonadi-server.changes index beb1a74..23e0165 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Aug 14 08:02:02 UTC 2023 - Christophe Marin + +- Update to 23.07.90 + * New feature release +- Changes since 23.07.80: + * Debugging helper: indicate resource name in "Unknown resource" error msg + +------------------------------------------------------------------- +Tue Aug 1 10:13:09 UTC 2023 - Christophe Marin + +- Update to 23.07.80 + * New feature release +- Too many changes since 23.04.3, only listing bugfixes: + * Check for config file in the location of CONFIG_INSTALL_DIR (kde#418265) + * Fix wrong for clause in Akonadi::Session (kde#468343) + ------------------------------------------------------------------- Tue Jul 4 10:19:06 UTC 2023 - Christophe Marin diff --git a/akonadi-server.spec b/akonadi-server.spec index 19d660a..84b953e 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -17,17 +17,17 @@ %define rname akonadi -%define kf5_version 5.104.0 +%define kf5_version 5.105.0 %bcond_without released Name: akonadi-server -Version: 23.04.3 +Version: 23.07.90 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 @@ -41,7 +41,6 @@ BuildRequires: libxslt-tools BuildRequires: mariadb BuildRequires: postgresql-devel BuildRequires: shared-mime-info -BuildRequires: sqlite3-devel BuildRequires: cmake(KAccounts) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) @@ -72,6 +71,9 @@ Provides: akonadi5 = %{version} # Needed for users of unstable repositories Obsoletes: akonadi < %{version} Obsoletes: akonadi-runtime < %{version} +# Sqlite driver was removed, now uses Qt's +Obsoletes: akonadi-sqlite < %{version} +Provides: akonadi-sqlite = %{version} %description This package contains the data files of Akonadi, the KDE PIM storage @@ -112,14 +114,6 @@ Recommends: %{name} %description -n libKPim5AkonadiXml5 This package includes the Akonadi Xml library for Akonadi, the KDE PIM storage service. -%package sqlite -Summary: akonadi server's SQlite plugin -Requires: %{name} = %{version} -Supplements: (%{name} and sqlite3) - -%description sqlite -Akonadi server's SQlite plugin. - %package devel Summary: Akonadi Framework: Build Environment Requires: %{name} = %{version} @@ -159,7 +153,7 @@ 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_kf5 -d build -- -DQT_PLUGINS_DIR=%{_kf5_plugindir} %cmake_build %install @@ -219,9 +213,6 @@ This package contains AppArmor profiles for Akonadi. %files -n libKPim5AkonadiXml5 %{_kf5_libdir}/libKPim5AkonadiXml.so.* -%files sqlite -%{_kf5_plugindir}/sqldrivers/ - %files devel %dir %{_includedir}/KPim5 %dir %{_kf5_sharedir}/kdevappwizard