--- rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup.spec	2022/05/30 12:45:18	1.5
+++ rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup.spec	2022/08/08 13:21:32	1.10
@@ -1,6 +1,6 @@
 %define name smeserver-automysqlbackup
 %define version 3.0.RC6
-%define release 20
+%define release 26
 %define rpmver   3.0.RC6
 
 epoch: 2
@@ -15,8 +15,8 @@ URL:                http://sourceforge.n
 BuildRoot:          /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires:           e-smith-base, e-smith-release >= 10
-Requires:		pax
-Requires: automysqlbackup
+Requires:           pax
+Requires:           automysqlbackup
 BuildRequires:      e-smith-devtools
 Patch0: smeserver-automysqlbackup-AdjustableCronJob.patch
 Patch1: smeserver-automysqlbackup-enhanced-templates.patch
@@ -28,6 +28,10 @@ Patch6: smeserver-automysqlbackup-3.0.RC
 Patch7: smeserver-automysqlbackup-3.0.RC6-bz11622.patch
 Patch8: smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-support.patch
 Patch9: smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-rename-templates.patch
+Patch10: smeserver-automysqlbackup-3.0.RC6-bz11970.update-cron.patch
+Patch11: smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-fix-typos.patch
+Patch12: smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-rename-cron-directories.patch
+
 
 %description
 This RPM is an unofficial addon for the SME Server 10.x.  
@@ -37,11 +41,34 @@ This script is based on automysqlbackup
 
 
 %changelog
-* Mon May 30 2022 John Crisp <jcrisp@safeandsoundit.co.uk>  3.0.RC6-20.sme
-- Correct template names
+* Mon Aug 08 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-26.sme
+- Change cron directories to match templates [SME:11970]
+
+* Mon Aug 08 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-25.sme
+- Change rc2 to RC6 in config templates [SME:11970]
+- Fix DONT'T typo
+
+* Tue Jun 07 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-24.sme
+- Update cron [SME:11970]
+- Fix SQL in Maria 105
+- Remove automysql event and leave just smeserver-automysqlbackup-update
+- Fix some createlinks
+- Modify inits - but still leaves log errors if version not installed
+
+* Tue Jun 07 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-23.sme
+- Modify backup directory names [SME: 11970]
+
+* Tue May 31 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-22.sme
+- Fix more typos in templates [SME: 11970]
+
+* Tue May 31 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-21.sme
+- Fix typos in templates [SME: 11970]
+
+* Mon May 30 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-20.sme
+- Correct template names [SME: 11970]
 - Add enable instructions
 
-* Mon May 09 2022 John Crisp <jcrisp@safeandsoundit.co.uk>  3.0.RC6-19.sme
+* Mon May 09 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-19.sme
 - Add Maria DB 10.x support [SME: 11970]
 - Requires Koozali SME Server v10.x
 
@@ -115,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 perl createlinks
@@ -152,7 +182,7 @@ rm -rf $RPM_BUILD_ROOT
 
 #protect the backup folder
 chmod -R 700 /root/backup
-			     
+
 %preun
 %postun
 if [ $1 = 0 ] ; then
@@ -161,14 +191,14 @@ MYSQLUSER=backupuser
 echo "======================================================================="
 echo "	"
 echo "	delete mysql user and revoke all permissions"
-# This section deletes backupuser
+# This section deletes backupuser for the standard DB
 mysql -u root -e "REVOKE ALL PRIVILEGES ON *.* FROM '$MYSQLUSER'@'localhost';"
 mysql -u root -e "DROP USER $MYSQLUSER@localhost;"
 echo "	"
 echo "Do that for each DB - e.g mysq55, mysql57, mariadb101, maria105 etc"
 echo "	"
 # Delete custom template fragment
-echo "	delete db configuration automysqlbackup"
+echo "	Deleting configuration automysqlbackup"
 echo "	"
 echo "======================================================================="