--- rpms/smeserver-mysql57/contribs9/smeserver-mysql57.spec 2017/02/19 16:36:02 1.2 +++ rpms/smeserver-mysql57/contribs9/smeserver-mysql57.spec 2017/03/12 20:11:07 1.4 @@ -2,12 +2,14 @@ Summary: smeserver specific mysql57 conf %define name smeserver-mysql57 Name: %{name} %define version 2.0.0 -%define release 2 +%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 @@ -17,6 +19,12 @@ BuildRequires: e-smith-devtools >= 1.13. AutoReqProv: no %changelog +* Sun Mar 12 2017 Jean-Philipe Pialasse 2.0.0-4.sme +- fix conflict with mysql55 phpmyadmin fragment [SME: 10145] + +* Wed Mar 08 2017 Jean-Philipe Pialasse 2.0.0-3.sme +- fix init57 not used by dedicated mysql.init [SME: 10096] + * Sun Feb 19 2017 Jean-Philipe Pialasse 2.0.0-2.sme - fix requires rh-myql57 @@ -30,7 +38,8 @@ mysql57. %prep %setup - +%patch0 -p1 +%patch1 -p1 %build mkdir -p root/etc/e-smith/sql/init57