--- rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2016/03/18 11:09:07	1.2
+++ rpms/e-smith-mysql/sme10/e-smith-mysql.spec	2016/04/11 19:12:05	1.6
@@ -1,15 +1,16 @@
-# $Id: e-smith-mysql.spec,v 1.1 2016/02/05 22:29:58 stephdl Exp $
+# $Id: e-smith-mysql.spec,v 1.5 2016/03/31 12:57:40 unnilennium Exp $
 
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
 Name: %{name}
 %define version 2.6.0
-%define release 2
+%define release 5
 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: mariadb-server
@@ -20,9 +21,19 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
+* 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]
+
 * Fri Mar 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 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 <stephdl@de-labrusse.fr> 2.6.0-1.sme
 - Initial release to sme10
@@ -464,7 +475,8 @@ AutoReqProv: no
 - [1.3.0-12]
 - force mysql.init to print to stderr instead of stout
 
-* Wed Mar 23 2001 Tony Clayton <tonyc@e-smith.com>
+* Fri Mar 23 2001 Tony Clayton <tonyc@e-smith.com>
+  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
 
@@ -715,6 +727,8 @@ mysql.
 
 %prep
 %setup
+%patch0 -p1
+
 
 %build
 perl createlinks
@@ -739,16 +753,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)