--- rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup.spec	2021/04/17 02:56:42	1.2
+++ rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup.spec	2022/08/16 16:16:22	1.12
@@ -1,6 +1,6 @@
 %define name smeserver-automysqlbackup
 %define version 3.0.RC6
-%define release 17
+%define release 28
 %define rpmver   3.0.RC6
 
 epoch: 2
@@ -14,9 +14,9 @@ Source:             %{name}-%{version}.t
 URL:                http://sourceforge.net/projects/automysqlbackup/
 BuildRoot:          /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires:           e-smith-base, e-smith-release >= 9
-Requires:		pax
-Requires: automysqlbackup
+Requires:           e-smith-base, e-smith-release >= 10
+Requires:           pax
+Requires:           automysqlbackup
 BuildRequires:      e-smith-devtools
 Patch0: smeserver-automysqlbackup-AdjustableCronJob.patch
 Patch1: smeserver-automysqlbackup-enhanced-templates.patch
@@ -25,16 +25,64 @@ Patch3: smeserver-automysqlbackup-update
 Patch4: smeserver-automysqlbackup-3.0.RC6-bz10806.errorsAndCreateUsers.patch
 Patch5: smeserver-automysqlbackup-3.0.RC6-Update-MySQL-Init-for-Mariadb.patch
 Patch6: smeserver-automysqlbackup-3.0.RC6-bz11561.patch
+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
+Patch13: smeserver-automysqlbackup-3.0.RC6-bz11970.update-cron.2.patch
+Patch14: smeserver-automysqlbackup-3.0.RC6-bz11970.Add.Debug.patch
 
 %description
-This RPM is an unofficial addon for the SME Server 9.x.  
+This RPM is an unofficial addon for the SME Server 10.x.  
 The target audience is the Linux/E-smith administrator 
 who wants to backup their mysql databases with an automatic way.
 This script is based on automysqlbackup V3.0
 
 
-
 %changelog
+* Mon Aug 15 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-28.sme
+- Add debug patch to conf files
+
+* Mon Aug 15 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-27.sme
+- Modify cron line again to add -bc option [SME: 11970]
+- Modify runmysqlbackup to add option and conf input from cron
+
+* 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
+- Add Maria DB 10.x support [SME: 11970]
+- Requires Koozali SME Server v10.x
+
+* Sat Jun 05 2021 Terry Fage <terryf@ozemail.com.au> 3.0.RC6-18.sme
+-  mariadb should not backup information_schema [SME: 11622]
+
 * Fri Apr 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.RC6-17.sme
 - fix automysql freeze server on reboot after post-upgrade event [SME: 11561]
 
@@ -99,6 +147,14 @@ rm -rf $RPM_BUILD_ROOT
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 perl createlinks
@@ -136,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT
 
 #protect the backup folder
 chmod -R 700 /root/backup
-			     
+
 %preun
 %postun
 if [ $1 = 0 ] ; then
@@ -145,14 +201,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 etc"
+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 "======================================================================="