--- 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/05/09 07:58:31	1.65
@@ -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.64 2010/05/06 17:00:15 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 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -38,6 +38,9 @@ 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -56,6 +59,18 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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 +1196,9 @@ e-smith server central backup administra
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup