summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--akonadi.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/akonadi.spec b/akonadi.spec
index af397c6..fd254ea 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -19,7 +19,7 @@
Summary: PIM Storage Service
Name: akonadi
Version: 1.13.0
-Release: 11%{?dist}
+Release: 12%{?dist}
License: LGPLv2+
URL: http://community.kde.org/KDE_PIM/Akonadi
@@ -86,7 +86,7 @@ BuildRequires: pkgconfig(sqlite3) >= 3.6.23
BuildRequires: dbus-x11 xorg-x11-server-Xvfb
# backends, used at buildtime to query known locations of server binaries
# FIXME/TODO: set these via cmake directives, avoids needless buildroot items
-BuildRequires: %{mysql}-server
+BuildRequires: mariadb-server
BuildRequires: postgresql-server
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
@@ -108,6 +108,9 @@ Summary: Akonadi MySQL backend support
Obsoletes: akonadi < 1.7.90-2
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{mysql}-server
+%if "%{?mysql}" != "mariadb" && 0%{?fedora} > 21
+Recommends: mariadb-server
+%endif
Requires: qt4-mysql%{?_isa}
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
@@ -231,6 +234,10 @@ fi
%changelog
+* Sun Mar 08 2015 Rex Dieter <rdieter@fedoraproject.org> - 1.13.0-12
+- explicit BuildRequires: mariadb-server
+- -mysql: Recommends: mariadb-server (f22+, #1199797)
+
* Sun Mar 08 2015 Rex Dieter <rdieter@fedoraproject.org> 1.13.0-11
- explicitly Requires: mariadb(-sesrver) only as needed (#1199797)