From 4a7645fc141e085fca8afb132ba40d1d2b690de7 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Mon, 19 Feb 2018 02:54:01 +0100
Subject: [PATCH] Move my_print_defaults binary to the server package to
 resolve conflict with mariadb

---
 community-mysql.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/community-mysql.spec b/community-mysql.spec
index 3f4e694..e33d46f 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -90,7 +90,7 @@
 
 Name:             community-mysql
 Version:          5.7.21
-Release:          2%{?with_debug:.debug}%{?dist}
+Release:          3%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -776,7 +776,6 @@ fi
 %{_bindir}/mysqlpump
 %{_bindir}/mysqlshow
 %{_bindir}/mysqlslap
-%{_bindir}/my_print_defaults
 
 %{_mandir}/man1/mysql.1*
 %{_mandir}/man1/mysql_config_editor.1*
@@ -789,7 +788,6 @@ fi
 %{_mandir}/man1/mysqlpump.1*
 %{_mandir}/man1/mysqlshow.1*
 %{_mandir}/man1/mysqlslap.1*
-%{_mandir}/man1/my_print_defaults.1*
 %endif
 
 %if %{with clibrary}
@@ -849,6 +847,7 @@ fi
 %{_bindir}/myisam_ftdump
 %{_bindir}/myisamlog
 %{_bindir}/myisampack
+%{_bindir}/my_print_defaults
 %{_bindir}/mysql_install_db
 %{_bindir}/mysql_secure_installation
 %{_bindir}/mysql_ssl_rsa_setup
@@ -886,6 +885,7 @@ fi
 %{_mandir}/man1/myisampack.1*
 %{_mandir}/man1/myisam_ftdump.1*
 %{_mandir}/man1/mysql.server.1*
+%{_mandir}/man1/my_print_defaults.1*
 %{_mandir}/man1/mysql_install_db.1*
 %{_mandir}/man1/mysql_secure_installation.1*
 %{_mandir}/man1/mysql_ssl_rsa_setup.1*
@@ -975,6 +975,9 @@ fi
 %endif
 
 %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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 - Removed 'static' library subpackage