--- 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/06/14 08:10:53	1.69
@@ -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.68 2010/06/07 14:34:17 filippocarletti 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 38
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -42,6 +42,9 @@ 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -60,6 +63,15 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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: 6054]
+
+* 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 +1216,9 @@ e-smith server central backup administra
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup