--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2011/06/14 20:50:18 1.86 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2011/06/14 21:22:55 1.87 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.85 2011/05/29 08:15:28 wellsi Exp $ +# $Id: e-smith-backup.spec,v 1.86 2011/06/14 20:50:18 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 54 +%define release 55 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -59,6 +59,7 @@ Patch46: e-smith-backup-2.2.0-backup-and Patch47: e-smith-backup-2.2.0-localize-backup-share-target-vfst.patch Patch48: e-smith-backup-2.2.0-RemoveEOL.patch Patch49: e-smith-backup-2.2.0-workstationTERM.patch +Patch50: e-smith-backup-2.2.0-modifiedFiles.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -77,6 +78,9 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* Tue Jun 14 2011 Ian Wells 2.2.0-55.sme +- Do not make backup fail when due to a modified file, by Filippo Carletti [SME: 6569] + * Sun Jun 12 2011 Ian Wells 2.2.0-54.sme - Change kill -9 to Kill TERM [SME: 6564] - Remove backup.orig file @@ -1296,6 +1300,7 @@ e-smith server central backup administra %patch47 -p1 %patch48 -p1 %patch49 -p1 +%patch50 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup