--- rpms/e-smith-backup/sme10/e-smith-backup.spec 2021/02/12 18:52:48 1.23 +++ rpms/e-smith-backup/sme10/e-smith-backup.spec 2021/03/12 06:18:05 1.25 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.22 2021/02/09 23:11:28 chrissn Exp $ +# $Id: e-smith-backup.spec,v 1.24 2021/02/17 21:37:52 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 22 +%define release 24 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -26,6 +26,8 @@ Patch12: e-smith-backup-2.6.0-restore_re 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 +Patch17: e-smith-backup-2.6.0-bz11424-preserve-rootdir-and-var-symlinks.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 @@ -48,6 +50,12 @@ Requires: e-smith-formmagick >= 1.4.0-12 Requires: nfs-utils %changelog +* Fri Mar 12 2021 Jean-Philipe Pialasse 2.6.0-24.sme +- fix dar restore replacing rootdir symlinks by folders [SME: 11424] + +* Wed Feb 17 2021 Chris Sansom-Ninnes 2.6.0-23.sme +- Remove duplicate gunzip call in perform_restore [SME: 11266] + * Fri Feb 12 2021 Chris Sansom-Ninnes 2.6.0-22.sme - Remove debug output of device names @@ -1493,7 +1501,8 @@ e-smith server central backup administra %patch13 -p1 %patch14 -p1 %patch15 -p1 - +%patch16 -p1 +%patch17 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup