--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/06/22 16:43:30	1.72
+++ rpms/e-smith-backup/sme8/e-smith-backup.spec	2011/05/29 08:15:28	1.85
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.71 2010/06/15 12:06:30 snetram Exp $
+# $Id: e-smith-backup.spec,v 1.84 2011/03/21 18:17:21 snetram Exp $
 
 Summary: e-smith module to provide the backup panel
 %define name e-smith-backup
 Name: %{name}
 %define version 2.2.0
-%define release 40
+%define release 53
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -47,6 +47,17 @@ Patch34: e-smith-backup-2.2.0-local_USB.
 Patch35: e-smith-backup-2.2.0-smbpassword2smbpasswd.patch
 Patch36: e-smith-backup-2.2.0-stripSpaces.patch
 Patch37: e-smith-backup-2.2.0-DesktopBackupTextUpdate.patch
+Patch38: e-smith-backup-2.2.0-restore_list_smbpasswd.patch
+Patch39: e-smith-backup-2.2.0-remove-relocate_samba_file.patch
+Patch40: e-smith-backup-2.2.0-workstation_tmpdir.patch
+Patch41: e-smith-backup-2.2.0-workstation_failure.patch
+Patch42: e-smith-backup-2.2.0-diskusage.patch
+Patch43: e-smith-backup-2.2.0-removeCaseConversion.patch
+Patch44: e-smith-backup-2.2.0-CheckDarReturnCode.patch 
+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-RemoveEOL.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -65,6 +76,45 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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]
+
+* Sun Mar 20 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-50
+- Localize dropdown box of backup destination type [SME: 6575]
+
+* Fri Mar 18 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-49
+- Fix strings referencing USB media [SME: 5955]
+
+* Mon Mar 14 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-48
+- Fix strings representing sequences [SME: 5961]
+
+* Fri Mar 11 2011 Ian Wells <esmith@wellsi.com> 2.2.0-47.sme
+- Backup to Workstation does not handle full remote disc gracefully, by Filippo Carletti [SME: 6355]
+
+* Sun Nov 21 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-46
+- Do not convert case of SmbShare on database migration [SME: 6387]
+
+* Sat Oct 10 2010 Ian Wells <esmith@wellsi.com> 2.2.0-45.sme
+- Include disk usage in Workstation Backup email [SME: 6143]
+
+* Mon Jul 19 2010 Ian Wells <esmith@wellsi.com> 2.2.0-44.sme
+- Indicate failure in Subject line of Workstation Backup [SME: 6121]
+
+* Fri Jul 9 2010 Ian Wells <esmith@wellsi.com> 2.2.0-43.sme
+- Only define Workstation Backup temporary directory once [SME: 5930]
+
+* Fri Jul 9 2010 Ian Wells <esmith@wellsi.com> 2.2.0-42.sme
+- Remove relocate_samba_file and all references to /etc/smbpasswd [SME: 6073]
+
+* Thu Jul 8 2010 Ian Wells <esmith@wellsi.com> 2.2.0-41.sme
+- Remove /etc/smbpasswd from restore_list [SME: 6071]
+
 * Tue Jun 22 2010 Ian Wells <esmith@wellsi.com> 2.2.0-40.sme
 - Update backup instructions in server-manager [SME: 6078]
 
@@ -1229,6 +1279,17 @@ e-smith server central backup administra
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup