--- rpms/e-smith-backup/sme10/e-smith-backup.spec	2016/08/10 17:35:05	1.7
+++ 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.6 2016/08/02 20:45:19 stephdl 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 6
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -17,6 +17,12 @@ Patch3: e-smith-backup-2.6.0.Do_Tar_Excl
 Patch4: e-smith-backup-2.6.0.Do_Dar_Exclusion.patch
 Patch5: e-smith-backup-2.6.0.Do_Tar_Exclusion_In_the_console.patch
 Patch6: e-smith-backup-2.6.0.bz9563.UpdateDarCatalogFollowingBackups.patch 
+Patch7: e-smith-backup-2.6.0-bz9550.fixconsolerestore.patch
+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
@@ -39,6 +45,37 @@ 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
+
+* Tue Jul 18 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+- added patch for workstation backup lock [SME: 9127]
+- code from Stefano Zamboni <zamboni@mind-at-work.it>
+
+* Wed Apr 26 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+- added lock during backup to avoid multiple instance running [SME: 9127]
+- code from Stefano Zamboni <zamboni@mind-at-work.it>
+
+* Fri Apr 14 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+- added support back to ext2 and ext3 [SME: 9299]
+
+* Wed Apr 12 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+- fix removable device detection [SME: 9299]
+
+* Fri Feb 17 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- console restoration can be launched again from console [SME: 9550]
+
 * Wed Aug 10 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-6.sme
 - fixed bug on the dar catalog when backups are not added in it [SME: 9563]
 - Added e-smith-backup-2.6.0.bz9563.UpdateDarCatalogFollowingBackups.patch
@@ -1429,6 +1466,12 @@ e-smith server central backup administra
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup