diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 92acdc3..7812b2d 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c81b45d232be16f37661209ae30414b9d365b9633fee3101f02f0965faa0f5e4 -size 222 +oid sha256:fd263b82472d187e5fbe9c03c581be5156f3fe8a22b95b39d6208c8fb3b0a9c3 +size 221 diff --git a/mariadb.changes b/mariadb.changes index ce94234..30fedc5 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 24 12:54:56 UTC 2014 - michal.hrusecky@opensuse.org + +- some CentOS/Fedora compatibility + ------------------------------------------------------------------- Wed Sep 24 08:08:36 UTC 2014 - michal.hrusecky@opensuse.org diff --git a/mariadb.spec b/mariadb.spec index 52f31bf..7303ad4 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -100,7 +100,11 @@ Requires: logrotate # required by rcmysql Requires: %{name}-client Requires: %{name}-errormessages = %version +%if 0%{?suse_version} Requires: perl-base +%else +Requires: perl +%endif # systemd requirements for openSUSE >= 12.1 %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(systemd) @@ -121,6 +125,11 @@ Obsoletes: mysql < %{srv_vers} Obsoletes: mysql-Max < %{srv_vers} %endif Conflicts: otherproviders(mysql) +# Compatibility with Fedora/CentOS +Provides: mysql-server = %{srv_vers} +Provides: mariadb-server = %{srv_vers} +Conflicts: otherproviders(mysql-server) +Conflicts: otherproviders(mariadb-server) %description MariaDB is a backward compatible, drop-in replacement branch of the MySQL