--- 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/02/02 20:19:03 1.6 @@ -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.5 2013/06/06 17:17:30 vip-ire 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 6 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,12 @@ BuildRequires: e-smith-devtools >= 1.13. AutoReqProv: no %changelog +* Sun Feb 2 2014 Ian Wells 2.4.0-6.sme +- Use mysql_upgrade --force due to upgrade to MySQL 5.1 [SME: 8166] + +* Thu Jun 6 2013 Daniel Berteaud 2.4.0-5.sme +- Ignore mysql.event table [SME: 7603] + * Wed Mar 20 2013 Ian Wells 2.4.0-4.sme - Use --single-transaction in mysql-dump-tables [SME: 7497] @@ -698,6 +706,8 @@ mysql. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build perl createlinks