Kolab Groupware OBS

Changes of Revision 41

akonadi.spec Changed

@@ -12,8 +12,9 @@
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.12.42.1
+Version: 1.12.42.0
 # Magic provides since this is what ends up in the pkgconfig
+Provides: %{name}%{?_isa} = %{version}
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -42,7 +43,11 @@
 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
+%if 0%{?rhel} == 7
+BuildRequires: mariadb-server
+%else
 BuildRequires: mysql-server
+%endif
 BuildRequires: postgresql-server
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
@@ -64,7 +69,11 @@
 Obsoletes: akonadi < %{version}
 Provides: akonadi = %{version}
 Requires: %{name}%{?_isa} = %{version}-%{release}
+%if 0%{?rhel} == 7
+Requires: mariadb-server
+%else
 Requires: mysql-server
+%endif
 Requires: qt4-mysql%{?_isa}
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
@@ -197,13 +206,6 @@
 
 
 %changelog
-* Sun Feb 01 2015 Christian Mollekopf <mollekopf@kolabsys.com> - 1.12.42.1-0
-- Build on windows
-- fixed tags
-
-* Mon Dec 29 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.12.42.0-1
-- Versioned release from the proper branch
-
 * Mon Mar 24 2014 Christian Mollekopf <mollekopf@kolabsys.com> - 1.11.90-0
 - 1.11.90

debian.changelog Changed