--- rpms/smeserver-mysql55/contribs9/smeserver-mysql55.spec 2017/03/08 23:42:00 1.8 +++ rpms/smeserver-mysql55/contribs9/smeserver-mysql55.spec 2017/03/12 20:14:35 1.9 @@ -2,7 +2,7 @@ Summary: smeserver specific mysql55 conf %define name smeserver-mysql55 Name: %{name} %define version 2.0.0 -%define release 6 +%define release 7 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -12,6 +12,7 @@ Patch0: smeserver-mysql55-2.0.0-SME1009 Patch1: smeserver-mysql55-2.0.0-SME10095-phpmyadmin.patch Patch2: smeserver-mysql55-2.0.0-SME10099-prebackupdump.patch Patch3: smeserver-mysql55-2.0.0-SME1096.patch +Patch4: smeserver-mysql55-2.0.0-SME10145-phmyadminFragment.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: mysql55-mysql-server @@ -25,6 +26,9 @@ BuildRequires: e-smith-devtools >= 1.13. AutoReqProv: no %changelog +* Sun Mar 12 2017 Jean-Philipe Pialasse 2.0.0-7.sme +- fix conflict with mysql57 phpmyadmin fragment [SME: 10145] + * Wed Mar 08 2017 Jean-Philipe Pialasse 2.0.0-6.sme - fix init55 not used by dedicated mysql.init [SME: 1096] @@ -59,6 +63,7 @@ mysql55. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build mkdir -p root/etc/e-smith/sql/init55