--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/02/09 13:28:12 1.58 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2012/04/09 14:06:47 1.92 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.57 2010/01/31 06:00:13 dungog Exp $ +# $Id: e-smith-backup.spec,v 1.91 2012/03/05 01:11: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 28 +%define release 60 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -36,7 +36,35 @@ Patch23: e-smith-backup-2.2.0-fullSunday Patch24: e-smith-backup-2.2.0-once_a_day.patch 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.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 +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 +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 +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 +Patch54: e-smith-backup-2.2.0-SelectiveBackup.patch +Patch55: e-smith-backup-2.2.0-catalog.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -55,6 +83,103 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* Mon Apr 9 2012 Jonathan Martens 2.2.0-60 +- Prevent selective restore timeout by creating dar catalog after backup [SME: 6052] + +* Sun Mar 04 2012 Ian Wells 2.2.0-59.sme +- Fix selective restore in modern browsers[SME: 6645] + +* 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] + +* 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: 6062] + +* 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] + +* Tue May 11 2010 Jonathan Martens 2.2.0-35.sme +- Fix removal of leading slash in storage location [SME: 5928] + +* Thu May 9 2010 Ian Wells 2.2.0-34.sme +- Add system name in Workstation Backups email [SME: 5706] + +* Thu May 6 2010 Ian Wells 2.2.0-33.sme +- To: field missing from header in Workstation Backups email [SME: 5924] + +* Wed Mar 17 2010 Jonathan Martens 2.2.0-32.sme +- Partly revert previous patch due to undesired side effects to smbpasswd [SME: 5857] + +* Wed Mar 17 2010 Jonathan Martens 2.2.0-31.sme +- Adjust backup routines for relocation of samba secrets.tdb file [SME: 5857] + +* Mon Feb 15 2010 Stephen Noble 2.2.0-30.sme +- Improved upgrade compatibility, remove .orig [SME: 4809] + +* Fri Feb 12 2010 Stephen Noble 2.2.0-29.sme +- fix mount point for verify [SME: 5765] + * Tue Feb 9 2010 Stephen Noble 2.2.0-28.sme - create mount point for verify [SME: 5765] @@ -1173,6 +1298,34 @@ e-smith server central backup administra %patch25 -p1 %patch26 -p1 %patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%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 +%patch54 -p1 +%patch55 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup