--- rpms/e-smith-backup/sme7/e-smith-backup.spec	2010/06/15 12:08:08	1.55
+++ rpms/e-smith-backup/sme7/e-smith-backup.spec	2010/06/21 22:27:27	1.59
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.54 2010/06/14 19:49:16 wellsi Exp $
+# $Id: e-smith-backup.spec,v 1.58 2010/06/21 21:21:21 wellsi Exp $
 
 Summary: e-smith module to provide the backup panel
 %define name e-smith-backup
 Name: %{name}
 %define version 2.0.0
-%define release 27
+%define release 30
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -35,6 +35,8 @@ Patch22: e-smith-backup-2.0.0-FullSunday
 Patch23: e-smith-backup-2.0.0-workstation-To-field.patch
 Patch24: e-smith-backup-2.0.0-stripSpaces.patch
 Patch25: e-smith-backup-2.0.0-smbpassword2smbpasswd.patch
+Patch26: e-smith-backup-2.0.0-smbpasswdPanelText.patch
+Patch27: e-smith-backup-2.0.0-DesktopBackupTextUpdate.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -53,7 +55,16 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
-* Tue Jun 15 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-27.sme
+* Mon Jun 21 2010 Ian Wells <esmith@wellsi.com> 2.0.0-30.sme
+- Update backup instructions in server-manager [SME: 5222]
+
+* Mon Jun 21 2010 Ian Wells <esmith@wellsi.com> 2.0.0-29.sme
+- /etc/smbpasswd should not be mentioned in the panels [SME: 6070]
+
+* Sat Jun 15 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-28.sme
+- Fix patch to not create .orig file [SME: 6054]
+
+* Tue Jun 15 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-27.sme
 - Fix error causing restore to report failed where it was complete [SME: 6054]
 
 * Mon Jun 14 2010 Ian Wells <esmith@wellsi.com> 2.0.0-26.sme
@@ -1164,6 +1175,8 @@ e-smith server central backup administra
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup