--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/03/17 18:53:06	1.63
+++ rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/06/14 21:15:04	1.70
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.62 2010/03/17 18:43:55 snetram Exp $
+# $Id: e-smith-backup.spec,v 1.69 2010/06/14 08:10:53 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 32
+%define release 39
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -39,6 +39,13 @@ Patch26: e-smith-backup-2.2.0-smbpasswd_
 Patch27: e-smith-backup-2.2.0-create_mount.patch2
 Patch28: e-smith-backup-2.2.0-nolowercase.patch
 Patch29: e-smith-backup-2.2.0-adjust-for-samba-tdb-locations.patch
+Patch30: e-smith-backup-2.2.0-workstation-To-field.patch
+Patch31: e-smith-backup-2.2.0-ServerNameEmail.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -57,6 +64,27 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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: 6054]
+
+* 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]
+
+* Thu May 13 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-36.sme
+- Revert patch from 2.2.0-31: secrets.tdb still in /etc/samba [SME: 5857]
+
+* Tue May 11 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-35.sme
+- Fix removal of leading slash in storage location [SME: 5928]
+
+* Thu May 9 2010 Ian Wells <esmith@wellsi.com> 2.2.0-34.sme
+- Add system name in Workstation Backups email [SME: 5706]
+
+* Thu May 6 2010 Ian Wells <esmith@wellsi.com> 2.2.0-33.sme
+- To: field missing from header in Workstation Backups email [SME: 5924]
+
 * Wed Mar 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-32.sme
 - Partly revert previous patch due to undesired side effects to smbpasswd [SME: 5857]
 
@@ -1189,6 +1217,13 @@ e-smith server central backup administra
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup