--- rpms/e-smith-mysql/sme10/e-smith-mysql.spec 2016/02/05 22:29:58 1.1 +++ rpms/e-smith-mysql/sme10/e-smith-mysql.spec 2016/03/31 12:57:40 1.5 @@ -1,25 +1,37 @@ -# $Id: e-smith-mysql.spec,v 1.10 2014/04/26 18:03:21 wellsi Exp $ +# $Id: e-smith-mysql.spec,v 1.4 2016/03/31 11:25:33 unnilennium Exp $ Summary: e-smith specific mysql configuration and templates. %define name e-smith-mysql Name: %{name} %define version 2.6.0 -%define release 1 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch0: e-smith-mysql-2.6.0-mariadb1.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch -Requires: mysql-server -Requires: mysql +Requires: mariadb-server +Requires: mariadb Requires: e-smith-base Requires: e-smith-lib >= 1.15.1-19 BuildRequires: e-smith-devtools >= 1.13.1-03 AutoReqProv: no %changelog +* Thu Mar 31 2016 Jean-Philipe Pialasse 2.6.0-4.sme +- new path for pid file with mariadb [SME: 9407] +- my.cnf : Innodb needs to be active for mariadb [SME: 9406] + +* Fri Mar 18 2016 Jean-Philipe Pialasse 2.6.0-2.sme +- fix mysql-server not found [SME: 9345] +- now using mariadb-server and mariadb +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + Wed Mar 23 2001 --> Wed Mar 21 2001 or Fri Mar 23 2001 or Wed Mar 28 2001 or .... + * Fri Feb 05 2016 stephane de Labrusse 2.6.0-1.sme - Initial release to sme10 @@ -460,7 +472,8 @@ AutoReqProv: no - [1.3.0-12] - force mysql.init to print to stderr instead of stout -* Wed Mar 23 2001 Tony Clayton +* Fri Mar 23 2001 Tony Clayton + Wed Mar 23 2001 --> Wed Mar 21 2001 or Fri Mar 23 2001 or Wed Mar 28 2001 or .... - [1.3.0-11] - fixed uninitialized value error in conf-mysql-startup @@ -711,6 +724,8 @@ mysql. %prep %setup +%patch0 -p1 + %build perl createlinks