--- rpms/e-smith-mysql/sme8/e-smith-mysql.spec	2008/10/07 18:44:56	1.6
+++ rpms/e-smith-mysql/sme8/e-smith-mysql.spec	2011/03/01 20:00:12	1.11
@@ -1,15 +1,18 @@
-# $Id$
+# $Id: e-smith-mysql.spec,v 1.10 2010/10/28 18:15:40 slords Exp $
 
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
 Name: %{name}
 %define version 2.2.0
-%define release 1
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch0: e-smith-mysql-2.2.0-fixLogging.patch
+Patch1: e-smith-mysql-2.2.0-fix_number_strip.patch
+Patch2: e-smith-mysql-2.2.0-too-many-open-files-error.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: mysql-server
@@ -20,6 +23,21 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
+* Tue Mar 1 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
+- Cater for open_files_limit option my.cnf through database and template [SME: 6438]
+
+* Thu Oct 28 2010 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
+- Fix stripping of starting numbers from script [SME: 6316]
+
+* Mon Jun  7 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-4.sme
+- Fix %postun typo [SME: 6030]
+
+* Mon Feb 23 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-3.sme
+- Rework log-error logic [SME: 4807]
+
+* Tue Dec 2 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
+- Fix log-error detection algorithm [SME: 4807]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -665,6 +683,9 @@ mysql.
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 mkdir -p root/etc/e-smith/sql/init
@@ -716,7 +737,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun
 if [ "$1" == 0 ]; then
-  [ -l /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld
+  [ -L /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld || :
 fi
 
 %files -f %{name}-%{version}-filelist