--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/02/15 10:18:55	1.60
+++ 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.59 2010/02/12 13:08:07 dungog 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 30
+%define release 42
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -38,6 +38,17 @@ Patch25: e-smith-backup-2.2.0-perform_ba
 Patch26: e-smith-backup-2.2.0-smbpasswd_not_last.patch
 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
+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
@@ -56,6 +67,42 @@ 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]
+
+* 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]
+
+* Wed Mar 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-31.sme
+- Adjust backup routines for relocation of samba secrets.tdb file [SME: 5857]
+
 * Mon Feb 15 2010 Stephen Noble <support@dungog.net> 2.2.0-30.sme
 - Improved upgrade compatibility, remove .orig [SME: 4809]
 
@@ -1181,6 +1228,17 @@ e-smith server central backup administra
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup