--- rpms/smeserver-mysql57/contribs9/smeserver-mysql57.spec	2017/03/08 23:52:19	1.3
+++ rpms/smeserver-mysql57/contribs9/smeserver-mysql57.spec	2017/03/12 20:11:07	1.4
@@ -2,13 +2,14 @@ Summary: smeserver specific mysql57 conf
 %define name smeserver-mysql57
 Name: %{name}
 %define version 2.0.0
-%define release 3
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-mysql57-2.0.0-SME10096.patch
+Patch1: smeserver-mysql57-2.0.0-SME10145-phmyadminFragment.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: rh-mysql57
@@ -18,6 +19,9 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
+* Sun Mar 12 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.0.0-4.sme
+- fix conflict with mysql55 phpmyadmin fragment [SME: 10145]
+
 * Wed Mar 08 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.0.0-3.sme
 - fix init57 not used by dedicated mysql.init [SME: 10096]
 
@@ -35,6 +39,7 @@ mysql57.
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
 
 %build
 mkdir -p root/etc/e-smith/sql/init57