--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/06/07 14:34:17	1.68
+++ rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/07/09 17:43:14	1.74
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.67 2010/05/14 11:19:46 filippocarletti Exp $
+# $Id: e-smith-backup.spec,v 1.73 2010/07/08 21:27:13 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 37
+%define release 42
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -44,6 +44,11 @@ Patch31: e-smith-backup-2.2.0-ServerName
 Patch32: e-smith-backup-2.2.0-fix-leading-slash-removal.patch
 Patch33: e-smith-backup-2.2.0-secrets_tdb.patch
 Patch34: e-smith-backup-2.2.0-local_USB.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -62,6 +67,21 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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]
+
+* Mon Jun 14 2010 Ian Wells <esmith@wellsi.com> 2.2.0-39.sme
+- Strip spaces from Workstation Backup hostname [SME: 6060]
+
+* Mon Jun 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-38.sme
+- Fix error causing restore to report failed where it was complete [SME: 6062]
+
 * Mon Jun  7 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-37.sme
 - Check if local USB disk is mounted in backup panel [SME: 6033]
 
@@ -1214,6 +1234,11 @@ e-smith server central backup administra
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup