--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/05/11 11:52:24	1.66
+++ rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/10/10 13:57:09	1.77
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.65 2010/05/09 07:58:31 wellsi Exp $
+# $Id: e-smith-backup.spec,v 1.76 2010/07/19 21:22:31 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 35
+%define release 45
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -42,6 +42,16 @@ Patch29: e-smith-backup-2.2.0-adjust-for
 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
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -60,6 +70,36 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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]
+
+* 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]
 
@@ -1204,6 +1244,16 @@ e-smith server central backup administra
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup