--- 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	2021/02/17 21:37:52	1.24
@@ -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.23 2021/02/12 18:52:48 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 23
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -21,6 +21,12 @@ 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
+Patch13: e-smith-backup-2.6.0-addinclude.patch
+Patch14: e-smith-backup-2.6.0-bz11124.patch
+Patch15: e-smith-backup-2.6.0-replacehal.patch
+Patch16: e-smith-backup-2.6.0-dupgunzip.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
@@ -43,6 +49,34 @@ Requires: e-smith-formmagick >= 1.4.0-12
 Requires: nfs-utils
 
 %changelog
+* Wed Feb 17 2021 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-23.sme
+- Remove duplicate gunzip call in perform_restore [SME: 11266]
+
+* Fri Feb 12 2021 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-22.sme
+- Remove debug output of device names
+
+* Tue Feb 9 2021 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-21.sme
+- Revert BlockDevices.pm and backup call to not filter to removable drives
+
+* Sat Jan 30 2021 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-20.sme
+- Replace hal-* calls with BlockDevices [SME: 11319]
+
+* Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-19.sme
+- add update event [SME: 11124]
+
+* Sun Jun 7 2020 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-17.sme
+- Added /etc/backup-data.d to backup paths [SME:10245]
+
+* Sun May 3 2020 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 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]
+- 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 +1492,12 @@ e-smith server central backup administra
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup