--- rpms/e-smith-backup/sme10/e-smith-backup.spec 2020/05/03 20:37:19 1.16 +++ rpms/e-smith-backup/sme10/e-smith-backup.spec 2020/06/07 19:52:24 1.18 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.15 2020/04/10 14:16:35 chrissn Exp $ +# $Id: e-smith-backup.spec,v 1.17 2020/05/05 22:43:50 jpp Exp $ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} %define version 2.6.0 -%define release 15 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -23,6 +23,7 @@ Patch9: e-smith-backup-2.6.0-bz9127-add_ Patch10: e-smith-backup-2.6.0-add_ai_to_delete_incomplete.patch Patch11: e-smith-backup-2.6.0-blockdev.patch Patch12: e-smith-backup-2.6.0-restore_rewrite.patch +Patch13: e-smith-backup-2.6.0-addinclude.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 @@ -45,7 +46,10 @@ Requires: e-smith-formmagick >= 1.4.0-12 Requires: nfs-utils %changelog -* Sun May 3 2020 Chris Sansom-Ninnes 2.6.0-15.sme +* Sun Jun 7 2020 Chris Sansom-Ninnes 2.6.0-17.sme +- Added /etc/backup-data.d to backup paths [SME:10245] + +* Sun May 3 2020 Chris Sansom-Ninnes 2.6.0-16.sme - Added error handling to restore using pipe pattern from perform_backup [SME:3139] - Made reboot optional after console restore - Fixed bootstrap restore not activating config changes [SME:10921] @@ -1472,6 +1476,7 @@ e-smith server central backup administra %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup