--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2013/12/12 06:50:27 1.110 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2013/12/22 17:51:40 1.111 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.109 2013/12/12 05:36:08 wellsi Exp $ +# $Id: e-smith-backup.spec,v 1.110 2013/12/12 06:50:27 wellsi Exp $ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} %define version 2.2.0 -%define release 77 +%define release 78 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -81,6 +81,7 @@ Patch68: e-smith-backup-2.2.0-workstatio Patch69: e-smith-backup-2.2.0-workstation-selectiveRestore.patch Patch70: e-smith-backup-2.2.0-workstation-setNumbering.patch Patch71: e-smith-backup-2.2.0-workstation-removeSet0.patch +Patch72: e-smith-backup-2.2.0-workstation-timeMismatch.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -99,6 +100,10 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* Sun Dec 21 2013 Ian Wells 2.2.0-78.sme +- Workstation Backup, do not fail backup for mtime/ctime mismatch [SME: 8076] +- Remove Workstation Backup Set numbering patch [SME: 7762] + * Wed Dec 11 2013 Ian Wells 2.2.0-77.sme - Workstation Backup, count backup sets from 1 [SME: 7762] Set numbering patch by Dave Liquorice @@ -1413,7 +1418,8 @@ e-smith server central backup administra %patch68 -p1 %patch69 -p1 %patch70 -p1 -%patch71 -p1 +#%patch71 -p1 # do not apply this patch as needs further testing +%patch72 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup