--- rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup.spec 2022/06/08 11:55:27 1.9 +++ rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup.spec 2022/10/04 10:51:42 1.15 @@ -1,6 +1,6 @@ %define name smeserver-automysqlbackup %define version 3.0.RC6 -%define release 24 +%define release 31 %define rpmver 3.0.RC6 epoch: 2 @@ -16,7 +16,7 @@ BuildRoot: /var/tmp/%{name}-%{v BuildArchitectures: noarch Requires: e-smith-base, e-smith-release >= 10 Requires: pax -Requires: automysqlbackup +Requires: automysqlbackup >= 3.0.RC6-8 BuildRequires: e-smith-devtools Patch0: smeserver-automysqlbackup-AdjustableCronJob.patch Patch1: smeserver-automysqlbackup-enhanced-templates.patch @@ -29,6 +29,11 @@ Patch7: smeserver-automysqlbackup-3.0.RC 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 +Patch15: smeserver-automysqlbackup-3.0.RC6-remove-myserver-conf-template.patch %description This RPM is an unofficial addon for the SME Server 10.x. @@ -36,8 +41,30 @@ The target audience is the Linux/E-smith who wants to backup their mysql databases with an automatic way. This script is based on automysqlbackup V3.0 - %changelog +* Tue Oct 04 2022 John Crisp 3.0.RC6-31.sme +- Remove myserver.conf template expansion as template no longer exists + +* Mon Aug 22 2022 John Crisp 3.0.RC6-30.sme +- Forgot to change the version on the Changelog line below + +* Mon Aug 22 2022 John Crisp 3.0.RC6-29.sme +- Bump automysqlbackup requires + +* Mon Aug 15 2022 John Crisp 3.0.RC6-28.sme +- Add debug patch to conf files + +* Mon Aug 15 2022 John Crisp 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 3.0.RC6-26.sme +- Change cron directories to match templates [SME:11970] + +* Mon Aug 08 2022 John Crisp 3.0.RC6-25.sme +- Change rc2 to RC6 in config templates [SME:11970] +- Fix DONT'T typo + * Tue Jun 07 2022 John Crisp 3.0.RC6-24.sme - Update cron [SME:11970] - Fix SQL in Maria 105 @@ -133,6 +160,11 @@ rm -rf $RPM_BUILD_ROOT %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 %build perl createlinks @@ -170,7 +202,7 @@ rm -rf $RPM_BUILD_ROOT #protect the backup folder chmod -R 700 /root/backup - + %preun %postun if [ $1 = 0 ] ; then