--- rpms/e-smith-mysql/sme9/e-smith-mysql.spec	2013/03/21 01:04:06	1.4
+++ rpms/e-smith-mysql/sme9/e-smith-mysql.spec	2014/03/18 02:42:43	1.7
@@ -1,10 +1,10 @@
-# $Id: e-smith-mysql.spec,v 1.3 2013/03/17 03:57:00 wellsi Exp $
+# $Id: e-smith-mysql.spec,v 1.6 2014/02/02 20:19:03 wellsi Exp $
 
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
 Name: %{name}
 %define version 2.4.0
-%define release 4
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,8 @@ Source: %{name}-%{version}.tar.xz
 Patch1: e-smith-mysql-2.4.0-remove_innodb_log_arch_dir.patch
 Patch2: e-smith-mysql-2.4.0-mysqlUpgrade.patch
 Patch3: e-smith-mysql-2.4.0-preBackup.patch
+Patch4: e-smith-mysql-2.4.0-ignore_event_table.patch
+Patch5: e-smith-mysql-2.4.0-ColumnCount.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: mysql-server
@@ -23,6 +25,15 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
+* Mon Mar 17 2014 Ian Wells <esmith@wellsi.com> 2.4.0-7.sme
+- Use mysql_upgrade in 00_restore_dumped_dbs, by Terje Edseth [SME: 8166]
+
+* Sun Feb 2 2014 Ian Wells <esmith@wellsi.com> 2.4.0-6.sme
+- Use mysql_upgrade --force due to upgrade to MySQL 5.1 [SME: 8166]
+
+* Thu Jun 6 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-5.sme
+- Ignore mysql.event table [SME: 7603]
+
 * Wed Mar 20 2013 Ian Wells <esmith@wellsi.com> 2.4.0-4.sme
 - Use --single-transaction in mysql-dump-tables [SME: 7497]
 
@@ -698,6 +709,8 @@ mysql.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -724,6 +737,9 @@ 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