--- rpms/e-smith-backup/sme7/e-smith-backup.spec 2011/04/13 20:42:08 1.66 +++ rpms/e-smith-backup/sme7/e-smith-backup.spec 2011/06/13 21:12:17 1.67 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.65 2011/04/09 15:19:58 snetram Exp $ +# $Id: e-smith-backup.spec,v 1.66 2011/04/13 20:42:08 snetram Exp $ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} %define version 2.0.0 -%define release 35 +%define release 36 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -41,6 +41,7 @@ Patch28: e-smith-backup-2.0.0-once_a_day Patch29: e-smith-backup-2.0.0-CheckDarReturnCode.patch Patch30: e-smith-backup-2.0.0-handle-dirs-using-DirHandle.patch Patch31: e-smith-backup-2.0.0-fix-exclude-regex.patch +Patch32: e-smith-backup-2.0.0-modifiedFiles.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -59,6 +60,9 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* Fri Jun 10 2011 Ian Wells 2.0.0-36.sme +- Do not make backup fail when due to a modified file, by Filippo Carletti [SME: 6635] + * Wed Apr 13 2011 Jonathan Martens 2.2.0-35.sme - Fix variable initialization [SME: 6512] @@ -1200,6 +1204,7 @@ e-smith server central backup administra %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup