--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/02/12 13:08:07	1.59
+++ rpms/e-smith-backup/sme8/e-smith-backup.spec	2010/03/17 18:53:06	1.63
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.58 2010/02/09 13:28:12 dungog Exp $
+# $Id: e-smith-backup.spec,v 1.62 2010/03/17 18:43:55 snetram Exp $
 
 Summary: e-smith module to provide the backup panel
 %define name e-smith-backup
 Name: %{name}
 %define version 2.2.0
-%define release 29
+%define release 32
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -37,6 +37,8 @@ Patch24: e-smith-backup-2.2.0-once_a_day
 Patch25: e-smith-backup-2.2.0-perform_backup-hal.patch
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -55,6 +57,15 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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]
+
 * Fri Feb 12 2010 Stephen Noble <support@dungog.net> 2.2.0-29.sme
 - fix mount point for verify [SME: 5765]
 
@@ -1176,6 +1187,8 @@ e-smith server central backup administra
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
+%patch29 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup