--- rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2016/03/31 11:25:33	1.4
+++ rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2016/07/19 18:42:04	1.11
@@ -1,16 +1,20 @@
-# $Id: e-smith-mysql.spec,v 1.3 2016/03/18 11:11:54 unnilennium Exp $
+# $Id: e-smith-mysql.spec,v 1.10 2016/07/19 16:52:53 stephdl Exp $
 
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
 Name: %{name}
 %define version 2.6.0
-%define release 3
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Patch0:  e-smith-mysql-2.6.0-mariadb1.patch
+Patch0: e-smith-mysql-2.6.0-mariadb1.patch
+Patch1: e-smith-mysql-2.6.0-mysqld2mariadb.patch
+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 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: mariadb-server
@@ -21,7 +25,24 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
-* Thu Mar 31 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+* Mon Jul 18 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-10.sme
+- Remove Dummy database from backup and restoration [SME: 9671]
+- Added  e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
+
+* Mon Jul 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+- fix forgotten mysqld variables in various scripts [SME: 9438]
+-  e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
+
+* Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-7.sme
+- Use default InnoDB settings [SME: 9439]
+
+* Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-6.sme
+- Rename mysqld to mariadb [SME: 9438]
+
+* Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-5.sme
+- Remove uneeded scriplets %post and %postun [SME: 9422]
+
+* Thu Mar 31 2016 Jean-Philipe Pialasse <tests@pialasse.com> 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]
 
@@ -725,7 +746,21 @@ mysql.
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+# mysqld renamed to mariadb [SME: 9438]
+# TODO: remove on next tarball creation
+rm -f root/service/mysqld
+rm -rf root/var/service/mysqld
+rm -rf root/var/run/
+rm -rf root/var/log/mysqld
+rm -f root/etc/rc.d/init.d/supervise/mysqld
+rm -f root/etc/rc.d/rc7.d/S50mysqld
 
+mkdir -p root/var/log/mariadb.run
 
 %build
 perl createlinks
@@ -734,14 +769,13 @@ perl createlinks
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-    --dir /var/run/mysqld 'attr(0755,mysql,mysql)' \
-    --file /var/service/mysqld/run 'attr(0755,root,root)' \
-    --file /var/service/mysqld/control/t 'attr(0750,root,root)' \
-    --file /var/service/mysqld/control/d 'attr(0750,root,root)' \
-    --file /var/service/mysqld/control/i 'attr(0750,root,root)' \
-    --file /var/service/mysqld/control/q 'attr(0750,root,root)' \
-    --file /var/service/mysqld/log/run 'attr(0755,root,root)' \
-    --dir '/var/log/mysqld' 'attr(2750,smelog,smelog)' \
+    --file /var/service/mariadb/run 'attr(0755,root,root)' \
+    --file /var/service/mariadb/control/t 'attr(0750,root,root)' \
+    --file /var/service/mariadb/control/d 'attr(0750,root,root)' \
+    --file /var/service/mariadb/control/i 'attr(0750,root,root)' \
+    --file /var/service/mariadb/control/q 'attr(0750,root,root)' \
+    --file /var/service/mariadb/log/run 'attr(0755,root,root)' \
+    --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \
     --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
     > %{name}-%{version}-filelist
 echo "%doc COPYING"          >> %{name}-%{version}-filelist
@@ -750,16 +784,8 @@ echo "%doc COPYING"          >> %{name}-
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# mysql.com compatibility
-[ -e /etc/rc.d/init.d/mysqld ] || ln -s ./mysql /etc/rc.d/init.d/mysqld
-# We remove this because the template has been renamed
-/bin/rm -f /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/sql/init/10fix_privilege_tables
-
 
 %postun
-if [ "$1" == 0 ]; then
-  [ -L /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld || :
-fi
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)