--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/07/09 17:43:14 1.74 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2012/01/16 02:00:16 1.90 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.73 2010/07/08 21:27:13 wellsi Exp $ +# $Id: e-smith-backup.spec,v 1.89 2012/01/02 01:00:39 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 42 +%define release 58 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -49,6 +49,20 @@ Patch36: e-smith-backup-2.2.0-stripSpace 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 +Patch43: e-smith-backup-2.2.0-removeCaseConversion.patch +Patch44: e-smith-backup-2.2.0-CheckDarReturnCode.patch +Patch45: e-smith-backup-2.2.0-fix-x-of-y-strings.patch +Patch46: e-smith-backup-2.2.0-backup-and-restore-textual-changes.patch +Patch47: e-smith-backup-2.2.0-localize-backup-share-target-vfst.patch +Patch48: e-smith-backup-2.2.0-RemoveEOL.patch +Patch49: e-smith-backup-2.2.0-workstationTERM.patch +Patch50: e-smith-backup-2.2.0-modifiedFiles.patch +Patch51: e-smith-backup-2.2.0-bareword-TERM.patch +Patch52: e-smith-backup-2.2.0-templateEmails.patch +Patch53: e-smith-backup-2.2.0-deleteIndexHtm.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -67,8 +81,57 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* Sun Jan 15 2012 Ian Wells 2.2.0-58.sme +- Remove default index.htm from Primary ibay before restore [SME: 6760] + +* Thu Dec 29 2011 Ian Wells 2.2.0-57.sme +- Additional email addresses for Workstation Backups [SME: 6783] + +* Tue Jul 19 2011 Jonathan Martens 2.2.0-56.sme +- Fix bareword TERM error introduced by 2.2.0-54 [SME: 6692] + +* Tue Jun 14 2011 Ian Wells 2.2.0-55.sme +- Do not make backup fail when due to a modified file, by Filippo Carletti [SME: 6569] + +* Sun Jun 12 2011 Ian Wells 2.2.0-54.sme +- Change kill -9 to Kill TERM [SME: 6564] +- Remove backup.orig file + +* Sun May 29 2011 Ian Wells 2.2.0-53.sme +- Remove EOL from volume labels [SME: 6605] + +* Mon Mar 21 2011 Jonathan Martens 2.2.0-52 +- Reverting previous changeset as it did more than it was supposed to do [SME: 6578] + +* Mon Mar 21 2011 Jonathan Martens 2.2.0-51 +- Fix html p entry [SME: 6578] + +* Sun Mar 20 2011 Jonathan Martens 2.2.0-50 +- Localize dropdown box of backup destination type [SME: 6575] + +* Fri Mar 18 2011 Jonathan Martens 2.2.0-49 +- Fix strings referencing USB media [SME: 5955] + +* Mon Mar 14 2011 Jonathan Martens 2.2.0-48 +- Fix strings representing sequences [SME: 5961] + +* Fri Mar 11 2011 Ian Wells 2.2.0-47.sme +- Backup to Workstation does not handle full remote disc gracefully, by Filippo Carletti [SME: 6355] + +* Sun Nov 21 2010 Jonathan Martens 2.2.0-46 +- Do not convert case of SmbShare on database migration [SME: 6387] + +* 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] +- 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] @@ -1239,6 +1302,20 @@ e-smith server central backup administra %patch37 -p1 %patch38 -p1 %patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%patch47 -p1 +%patch48 -p1 +%patch49 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup