--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/06/14 08:10:53 1.69 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/10/10 13:57:09 1.77 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.68 2010/06/07 14:34:17 filippocarletti Exp $ +# $Id: e-smith-backup.spec,v 1.76 2010/07/19 21:22:31 wellsi Exp $ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} %define version 2.2.0 -%define release 38 +%define release 45 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -45,6 +45,13 @@ Patch32: e-smith-backup-2.2.0-fix-leadin 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 +Patch37: e-smith-backup-2.2.0-DesktopBackupTextUpdate.patch +Patch38: e-smith-backup-2.2.0-restore_list_smbpasswd.patch +Patch39: e-smith-backup-2.2.0-remove-relocate_samba_file.patch +Patch40: e-smith-backup-2.2.0-workstation_tmpdir.patch +Patch41: e-smith-backup-2.2.0-workstation_failure.patch +Patch42: e-smith-backup-2.2.0-diskusage.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -63,8 +70,29 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* Sat Oct 10 2010 Ian Wells 2.2.0-45.sme +- Include disk usage in Workstation Backup email [SME: 6143] + +* Mon Jul 19 2010 Ian Wells 2.2.0-44.sme +- Indicate failure in Subject line of Workstation Backup [SME: 6121] + +* Fri Jul 9 2010 Ian Wells 2.2.0-43.sme +- Only define Workstation Backup temporary directory once [SME: 5930] + +* Fri Jul 9 2010 Ian Wells 2.2.0-42.sme +- Remove relocate_samba_file and all references to /etc/smbpasswd [SME: 6073] + +* Thu Jul 8 2010 Ian Wells 2.2.0-41.sme +- Remove /etc/smbpasswd from restore_list [SME: 6071] + +* Tue Jun 22 2010 Ian Wells 2.2.0-40.sme +- Update backup instructions in server-manager [SME: 6078] + +* 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] +- Fix error causing restore to report failed where it was complete [SME: 6062] * Mon Jun 7 2010 Filippo Carletti 2.2.0-37.sme - Check if local USB disk is mounted in backup panel [SME: 6033] @@ -1219,6 +1247,13 @@ e-smith server central backup administra %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup