Fix of broken cross mysql-mariadb dependecies
Fix of community-mysql server-client dependecy
This commit is contained in:
parent
fddd774f2c
commit
edace6bcbd
@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
Name: community-mysql
|
Name: community-mysql
|
||||||
Version: 5.7.17
|
Version: 5.7.17
|
||||||
Release: 3%{?with_debug:.debug}%{?dist}
|
Release: 4%{?with_debug:.debug}%{?dist}
|
||||||
Summary: MySQL client programs and shared libraries
|
Summary: MySQL client programs and shared libraries
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://www.mysql.com
|
URL: http://www.mysql.com
|
||||||
@ -173,9 +173,9 @@ BuildRequires: perl(Test::More)
|
|||||||
BuildRequires: perl(Time::HiRes)
|
BuildRequires: perl(Time::HiRes)
|
||||||
%{?with_init_systemd:BuildRequires: systemd}
|
%{?with_init_systemd:BuildRequires: systemd}
|
||||||
|
|
||||||
Requires: bash
|
|
||||||
Requires: fileutils
|
|
||||||
Requires: grep
|
Requires: bash fileutils grep
|
||||||
Requires: %{name}-common%{?_isa} = %{sameevr}
|
Requires: %{name}-common%{?_isa} = %{sameevr}
|
||||||
|
|
||||||
%if %{with mysql_names}
|
%if %{with mysql_names}
|
||||||
@ -267,7 +267,10 @@ MySQL packages.
|
|||||||
Summary: The MySQL server and related files
|
Summary: The MySQL server and related files
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
|
|
||||||
Requires: %{name}%{?_isa} = %{sameevr}
|
# Require any mysql client, but prefer community-mysql client for community-mysql server
|
||||||
|
Suggests: %{name}%{?_isa} = %{sameevr}
|
||||||
|
Requires: mysql%{?_isa}
|
||||||
|
|
||||||
Requires: %{name}-common%{?_isa} = %{sameevr}
|
Requires: %{name}-common%{?_isa} = %{sameevr}
|
||||||
Requires: %{_sysconfdir}/my.cnf
|
Requires: %{_sysconfdir}/my.cnf
|
||||||
Requires: %{_sysconfdir}/my.cnf.d
|
Requires: %{_sysconfdir}/my.cnf.d
|
||||||
@ -292,6 +295,8 @@ Obsoletes: mysql-bench%{?_isa}
|
|||||||
Obsoletes: community-mysql-bench < 5.7.8
|
Obsoletes: community-mysql-bench < 5.7.8
|
||||||
%{?with_conflicts:Conflicts: mariadb-server}
|
%{?with_conflicts:Conflicts: mariadb-server}
|
||||||
%{?with_conflicts:Conflicts: mariadb-galera-server}
|
%{?with_conflicts:Conflicts: mariadb-galera-server}
|
||||||
|
# A dependency mistake was made, to fix it, old version of the utils must be Obsoleted. Affected versions: F24, F25, F26 until their EOL.
|
||||||
|
Obsoletes: mariadb-server-utils < 3:10.1.21-3
|
||||||
|
|
||||||
%description server
|
%description server
|
||||||
MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
|
MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
|
||||||
@ -849,7 +854,6 @@ fi
|
|||||||
%{_bindir}/mysql_ssl_rsa_setup
|
%{_bindir}/mysql_ssl_rsa_setup
|
||||||
%{_bindir}/mysql_tzinfo_to_sql
|
%{_bindir}/mysql_tzinfo_to_sql
|
||||||
%{_bindir}/mysql_upgrade
|
%{_bindir}/mysql_upgrade
|
||||||
%{_bindir}/mysqlbinlog
|
|
||||||
%if %{with init_systemd}
|
%if %{with init_systemd}
|
||||||
%{_bindir}/mysqld_pre_systemd
|
%{_bindir}/mysqld_pre_systemd
|
||||||
%else
|
%else
|
||||||
@ -966,6 +970,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 15 2017 Michal Schorm <mschorm@redhat.com> - 5.7.17-4
|
||||||
|
- Fix of broken cross mysql-mariadb dependecies
|
||||||
|
- Fix of community-mysql server-client dependecy
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.17-3
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.17-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user