diff --git a/akonadi-server.changes b/akonadi-server.changes index 5600744..e9bd110 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Oct 18 14:58:50 UTC 2022 - Antonio Larrosa + +- In SLE-15-SP3 we had patches that made akonadi fall back to + sqlite if the mysql backend is not available. Those patches were + already merged by upstream so we can let the package Recommend + mysql instead of Require it, since it's not available in SLED. + The Requires are set unless branding-SLE is installed so the + requirements are used in Leap/TW but not in SLE where it's only + a Recommends and an alternate Requirements is used in that case + where the sqlite backend is installed if mysql is not available. + ------------------------------------------------------------------- Tue Oct 11 14:31:39 UTC 2022 - Christophe Giboudeaux diff --git a/akonadi-server.spec b/akonadi-server.spec index 33b77d8..20a8538 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -1,7 +1,7 @@ # # spec file for package akonadi-server # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -70,8 +70,11 @@ BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) -Requires: libqt5-sql-mysql -Requires: mysql +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 # FIXME: Check if it's worth it Recommends: kaccounts-integration Recommends: kaccounts-providers