--- rpms/e-smith-backup/sme10/e-smith-backup.spec	2020/03/16 11:30:22	1.14
+++ rpms/e-smith-backup/sme10/e-smith-backup.spec	2020/05/03 20:37:19	1.16
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.13 2017/07/18 14:37:15 unnilennium Exp $
+# $Id: e-smith-backup.spec,v 1.15 2020/04/10 14:16:35 chrissn Exp $
 
 Summary: e-smith module to provide the backup panel
 %define name e-smith-backup
 Name: %{name}
 %define version 2.6.0
-%define release 13
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -21,6 +21,8 @@ Patch7: e-smith-backup-2.6.0-bz9550.fixc
 Patch8: e-smith-backup-2.6.0-bz9299-consoleBackupBlockDevice.patch
 Patch9: e-smith-backup-2.6.0-bz9127-add_lock_feature.patch
 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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
@@ -43,6 +45,16 @@ Requires: e-smith-formmagick >= 1.4.0-12
 Requires: nfs-utils
 
 %changelog
+* Sun May 3 2020 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-15.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]
+- Manually added ext2 and ext3 to Block Device file system check where ext4 present
+
+* Fri Apr 3 2020 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-14.sme
+- updated Block Device discovery to fix recovery from console [SME:8244]
+- Credit to Catton Durbrow
+
 * Mon Mar 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk 2.6.0-13.sme
 - added the '-ai' flag to clean up incomplete files on fail [SME:9159]
 - Credit to Chris Sansom-Ninnes
@@ -1458,6 +1470,8 @@ e-smith server central backup administra
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup