--- rpms/e-smith-mysql/sme7/e-smith-mysql.spec	2007/06/12 15:47:46	1.1
+++ rpms/e-smith-mysql/sme7/e-smith-mysql.spec	2010/06/09 23:05:16	1.7
@@ -1,24 +1,16 @@
+# $Id: e-smith-mysql.spec,v 1.6 2010/06/07 14:38:16 filippocarletti Exp $
+
 Summary: e-smith specific mysql configuration and templates.
 %define name e-smith-mysql
 Name: %{name}
-%define version 1.12.0
-%define release 14
+%define version 2.0.0
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-mysql-1.12.0-setpassword.patch2
-Patch1: e-smith-mysql-1.12.0-flushprivssemicolon.patch 
-Patch2: e-smith-mysql-1.12.0-innodb-optional.patch
-Patch3: e-smith-mysql-1.12.0-install_db.patch
-Patch4: e-smith-mysql-1.12.0.disabled_pre_backup.patch
-Patch5: e-smith-mysql-1.12.0.failed_restore.patch
-Patch6: e-smith-mysql-1.12.0-split_backup_db.patch
-Patch7: e-smith-mysql-1.12.0-mysqluser.patch
-Patch8: e-smith-mysql-1.12.0-max_allowed_packet.patch
-Patch9: e-smith-mysql-1.12.0-max_allowed_packet2.patch
-Patch10: e-smith-mysql-1.12.0-force_upgrade.patch
+Patch0: e-smith-mysql-2.0.0-fixLogging.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: mysql-server
@@ -29,6 +21,21 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 
 %changelog
+* Mon Jun  7 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.0.0-4.sme
+- Fix %postun typo [SME: 6043]
+
+* Mon Feb 23 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-3.sme
+- Rework log-error logic [SME: 4807]
+
+* Tue Dec 2 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-2.sme
+- Fix log-error detection algorithm [SME: 4807]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.0.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.12.0-15
+- quote "$1" in post uninstall script [SME: 349]
+
 * Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
 - Clean up spec so package can be built by koji/plague
 
@@ -663,15 +670,6 @@ mysql.
 %prep
 %setup
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch10 -p1
 
 %build
 mkdir -p root/etc/e-smith/sql/init
@@ -722,8 +720,8 @@ rm -rf $RPM_BUILD_ROOT
 [ -e /etc/rc.d/init.d/mysqld ] || ln -s ./mysql /etc/rc.d/init.d/mysqld
 
 %postun
-if [ $1 == 0 ]; then
-  [ -l /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld
+if [ "$1" == 0 ]; then
+  [ -L /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld || :
 fi
 
 %files -f %{name}-%{version}-filelist