--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/05/14 11:19:46 1.67 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/06/14 21:15:04 1.70 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.66 2010/05/11 11:52:24 snetram Exp $ +# $Id: e-smith-backup.spec,v 1.69 2010/06/14 08:10:53 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 36 +%define release 39 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -43,6 +43,9 @@ Patch30: e-smith-backup-2.2.0-workstatio 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 +Patch36: e-smith-backup-2.2.0-stripSpaces.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -61,6 +64,15 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* Mon Jun 14 2010 Ian Wells 2.2.0-39.sme +- Strip spaces from Workstation Backup hostname [SME: 6060] + +* Mon Jun 14 2010 Jonathan Martens 2.2.0-38.sme +- Fix error causing restore to report failed where it was complete [SME: 6054] + +* Mon Jun 7 2010 Filippo Carletti 2.2.0-37.sme +- Check if local USB disk is mounted in backup panel [SME: 6033] + * Thu May 13 2010 Filippo Carletti 2.2.0-36.sme - Revert patch from 2.2.0-31: secrets.tdb still in /etc/samba [SME: 5857] @@ -1209,6 +1221,9 @@ e-smith server central backup administra %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup