--- rpms/e-smith-backup/sme10/e-smith-backup.spec	2021/01/08 18:40:36	1.19
+++ 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.18 2020/06/07 19:52:24 chrissn 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 18
+%define release 23
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -25,6 +25,8 @@ Patch11: e-smith-backup-2.6.0-blockdev.p
 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
@@ -47,7 +49,19 @@ Requires: e-smith-formmagick >= 1.4.0-12
 Requires: nfs-utils
 
 %changelog
-* Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-18.sme
+* 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
@@ -1482,7 +1496,8 @@ e-smith server central backup administra
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-
+%patch15 -p1
+%patch16 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup