--- rpms/e-smith-mysql/sme10/e-smith-mysql.spec 2016/07/19 16:52:53 1.10 +++ rpms/e-smith-mysql/sme10/e-smith-mysql.spec 2020/12/08 02:55:37 1.15 @@ -1,10 +1,10 @@ -# $Id: e-smith-mysql.spec,v 1.9 2016/07/18 07:33:43 unnilennium Exp $ +# $Id: e-smith-mysql.spec,v 1.14 2016/07/24 15:20:03 unnilennium Exp $ Summary: e-smith specific mysql configuration and templates. %define name e-smith-mysql Name: %{name} %define version 2.6.0 -%define release 9 +%define release 14 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -15,6 +15,9 @@ Patch1: e-smith-mysql-2.6.0-mysqld2maria Patch2: e-smith-mysql-2.6.0-use_default_innodb_settings.patch Patch3: e-smith-mysql-2.6.0-mariadb_forgotten_var.patch Patch4: e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch +Patch5: e-smith-mysql-2.6.0.bz9688.skipredirect.patch +Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: mariadb-server @@ -25,7 +28,28 @@ BuildRequires: e-smith-devtools >= 1.13. AutoReqProv: no %changelog -* Mon Jul 18 2016 stephane de Labrusse 2.6.0-9.sme +* Mon Dec 07 2020 Jean-Philipe Pialasse 2.6.0-14.sme +- e-smith-update event [SME: 11145] +- mariadb systemd integration [SME: 11021] + move set.password and template + create /usr/lib/systemd/system/mariadb.service.d/sme.conf + create /sbin/e-smith/systemd/mariadb-initialize + chmod + cleanup +- mysql.init systemd integration [SME: 11120] + create mysql_init.service + + +* Sun Jul 24 2016 Jean-Philipe Pialasse 2.6.0-13.sme +- systemd skip redirect [SME: 9688] + +* Sat Jul 23 2016 stephane de Labrusse 2.6.0-12.sme +- Corrected a typo in e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch +- [SME: 9671] + +* Thu Jul 21 2016 Jean-Philipe Pialasse 2.6.0-11.sme +- fix broken link /etc/init.d/supervise/mariadb [SME: 9686] + +* Mon Jul 18 2016 stephane de Labrusse 2.6.0-10.sme - Remove Dummy database from backup and restoration [SME: 9671] - Added e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch @@ -750,7 +774,7 @@ mysql. %patch2 -p1 %patch3 -p1 %patch4 -p1 - +%patch5 -p1 # mysqld renamed to mariadb [SME: 9438] # TODO: remove on next tarball creation rm -f root/service/mysqld @@ -761,6 +785,8 @@ rm -f root/etc/rc.d/init.d/supervise/mys rm -f root/etc/rc.d/rc7.d/S50mysqld mkdir -p root/var/log/mariadb.run +%patch6 -p1 + %build perl createlinks