Move my_print_defaults binary to the server package to resolve conflict with mariadb

This commit is contained in:
Michal Schorm 2018-02-19 02:54:01 +01:00
parent 74f5555800
commit 2328bf1b18

View File

@ -84,7 +84,7 @@
Name: community-mysql Name: community-mysql
Version: 5.7.21 Version: 5.7.21
Release: 1%{?with_debug:.debug}%{?dist} Release: 3%{?with_debug:.debug}%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
URL: http://www.mysql.com URL: http://www.mysql.com
@ -769,7 +769,6 @@ fi
%{_bindir}/mysqlpump %{_bindir}/mysqlpump
%{_bindir}/mysqlshow %{_bindir}/mysqlshow
%{_bindir}/mysqlslap %{_bindir}/mysqlslap
%{_bindir}/my_print_defaults
%{_mandir}/man1/mysql.1* %{_mandir}/man1/mysql.1*
%{_mandir}/man1/mysql_config_editor.1* %{_mandir}/man1/mysql_config_editor.1*
@ -782,7 +781,6 @@ fi
%{_mandir}/man1/mysqlpump.1* %{_mandir}/man1/mysqlpump.1*
%{_mandir}/man1/mysqlshow.1* %{_mandir}/man1/mysqlshow.1*
%{_mandir}/man1/mysqlslap.1* %{_mandir}/man1/mysqlslap.1*
%{_mandir}/man1/my_print_defaults.1*
%endif %endif
%if %{with clibrary} %if %{with clibrary}
@ -842,6 +840,7 @@ fi
%{_bindir}/myisam_ftdump %{_bindir}/myisam_ftdump
%{_bindir}/myisamlog %{_bindir}/myisamlog
%{_bindir}/myisampack %{_bindir}/myisampack
%{_bindir}/my_print_defaults
%{_bindir}/mysql_install_db %{_bindir}/mysql_install_db
%{_bindir}/mysql_secure_installation %{_bindir}/mysql_secure_installation
%{_bindir}/mysql_ssl_rsa_setup %{_bindir}/mysql_ssl_rsa_setup
@ -879,6 +878,7 @@ fi
%{_mandir}/man1/myisampack.1* %{_mandir}/man1/myisampack.1*
%{_mandir}/man1/myisam_ftdump.1* %{_mandir}/man1/myisam_ftdump.1*
%{_mandir}/man1/mysql.server.1* %{_mandir}/man1/mysql.server.1*
%{_mandir}/man1/my_print_defaults.1*
%{_mandir}/man1/mysql_install_db.1* %{_mandir}/man1/mysql_install_db.1*
%{_mandir}/man1/mysql_secure_installation.1* %{_mandir}/man1/mysql_secure_installation.1*
%{_mandir}/man1/mysql_ssl_rsa_setup.1* %{_mandir}/man1/mysql_ssl_rsa_setup.1*
@ -968,6 +968,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Feb 19 2018 Michal Schorm <mschorm@redhat.com> - 5.7.21-3
- Move my_print_defaults binary to the server package to resolve conflict with mariadb
* Sat Feb 17 2018 Michal Schorm <mschorm@redhat.com> - 5.7.21-1 * Sat Feb 17 2018 Michal Schorm <mschorm@redhat.com> - 5.7.21-1
- Removed 'static' library subpackage - Removed 'static' library subpackage