--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2011/03/21 18:06:54	1.83
+++ 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.82 2011/03/20 10:46:35 snetram 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 51
+%define release 55
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -57,7 +57,9 @@ Patch44: e-smith-backup-2.2.0-CheckDarRe
 Patch45: e-smith-backup-2.2.0-fix-x-of-y-strings.patch
 Patch46: e-smith-backup-2.2.0-backup-and-restore-textual-changes.patch
 Patch47: e-smith-backup-2.2.0-localize-backup-share-target-vfst.patch
-Patch48: e-smith-backup-2.2.0-fix-html-p-entry.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
@@ -76,6 +78,19 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* Tue Jun 14 2011 Ian Wells <esmith@wellsi.com> 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 <esmith@wellsi.com> 2.2.0-54.sme
+- Change kill -9 to Kill TERM [SME: 6564]
+- Remove backup.orig file
+
+* Sun May 29 2011 Ian Wells <esmith@wellsi.com> 2.2.0-53.sme
+- Remove EOL from volume labels [SME: 6605]
+
+* Mon Mar 21 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-52
+- Reverting previous changeset as it did more than it was supposed to do [SME: 6578]
+
 * Mon Mar 21 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-51
 - Fix html p entry [SME: 6578]
 
@@ -1284,6 +1299,8 @@ e-smith server central backup administra
 %patch46 -p1
 %patch47 -p1
 %patch48 -p1
+%patch49 -p1
+%patch50 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup