--- rpms/e-smith-backup/sme7/e-smith-backup.spec	2009/07/22 17:38:10	1.48
+++ rpms/e-smith-backup/sme7/e-smith-backup.spec	2010/06/21 21:21:21	1.58
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.47 2009/07/22 13:59:42 gnujpl Exp $
+# $Id: e-smith-backup.spec,v 1.57 2010/06/15 12:17:13 snetram Exp $
 
 Summary: e-smith module to provide the backup panel
 %define name e-smith-backup
 Name: %{name}
 %define version 2.0.0
-%define release 20
+%define release 29
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -28,6 +28,14 @@ Patch15: e-smith-backup-2.0.0-password.p
 Patch16: e-smith-backup-2.0.0-fixCompressionLevelRange.patch
 Patch17: e-smith-backup-2.0.0-fixReport.patch
 Patch18: e-smith-backup-2.0.0-workstation_verify.patch
+Patch19: e-smith-backup-2.0.0-many_daily_dar.patch
+Patch20: e-smith-backup-2.0.0-CIFScredentials.patch
+Patch21: e-smith-backup-2.0.0-CIFScredentials2.patch
+Patch22: e-smith-backup-2.0.0-FullSunday.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -46,6 +54,33 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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
+- Strip spaces from Workstation Backup hostname [SME: 5664]
+
+* Thu May 6 2010 Ian Wells <esmith@wellsi.com> 2.0.0-25.sme
+- To: field missing from header in Workstation Backups email [SME: 5872]
+
+* Wed Nov 25 2009 Gavin Weight <gweight@gmail.com> 2.0.0-24.sme
+- Fix full backup on Sunday displayed as Everyday. [SME: 5624]
+
+* Wed Aug 26 2009 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.0-23.sme
+- workstation backup: add cifs credentials expand to bootstrap-console-save [SME: 4850]
+
+* Tue Aug 25 2009 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.0-22.sme
+- workstation backup: using credentials file for cifs mount [SME: 4850]
+
+* Sun Jul 26 2009 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.0-21.sme
+- workstation backup: allow many backups in the same day [SME: 5393]
+
 * Wed Jul 22 2009 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.0-20.sme
 - workstation restore: all needed backups must be available before restore [SME: 5395]
 - workstation verify: add option to check integrity of backups needed in a full restore [SME: 5396] 
@@ -1129,6 +1164,14 @@ e-smith server central backup administra
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup