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 18545727fc
commit 4a7645fc14

View File

@ -90,7 +90,7 @@
Name: community-mysql Name: community-mysql
Version: 5.7.21 Version: 5.7.21
Release: 2%{?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
@ -776,7 +776,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*
@ -789,7 +788,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}
@ -849,6 +847,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
@ -886,6 +885,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*
@ -975,6 +975,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
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.21-2 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
- Removed 'static' library subpackage - Removed 'static' library subpackage