--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2008/10/09 20:36:24 1.27 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/07/09 17:43:14 1.74 @@ -1,16 +1,54 @@ -# $Id: e-smith-backup.spec,v 1.26 2008/10/07 19:27:49 slords Exp $ +# $Id: e-smith-backup.spec,v 1.73 2010/07/08 21:27:13 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 2 +%define release 42 Version: %{version} Release: %{release}%{?dist} License: Artistic Group: Networking/Daemons Source: %{name}-%{version}.tar.gz Patch1: e-smith-backup-2.2.0-localise_fix.patch +Patch2: e-smith-backup-2.2.0-fixPleaseConfigure.patch +Patch3: e-smith-backup-2.2.0-restore_list.patch +Patch4: e-smith-backup-2.2.0-timeout.patch +Patch5: e-smith-backup-2.2.0-smbfs.patch +Patch6: e-smith-backup-2.2.0-mount_verify.patch +Patch7: e-smith-backup-2.2.0-nocompressogg.patch +Patch8: e-smith-backup-2.2.0-verbose.patch +Patch9: e-smith-backup-2.2.0-email.patch +Patch10: e-smith-backup-2.2.0-mount_usb.patch +Patch11: e-smith-backup-2.2.0-verbose_panel.patch +Patch12: e-smith-backup-2.2.0-gzip.patch +Patch13: e-smith-backup-2.2.0-empty.patch +Patch14: e-smith-backup-2.2.0-spelling.patch +Patch15: e-smith-backup-2.2.0-password.patch +Patch16: e-smith-backup-2.2.0-fixCompressionLevelRange.patch +Patch17: e-smith-backup-2.2.0-fixReport.patch +Patch18: e-smith-backup-2.2.0-workstation_verify.patch +Patch19: e-smith-backup-2.2.0-many_daily_dar.patch +Patch20: e-smith-backup-2.2.0-CIFScredentials.patch +Patch21: e-smith-backup-2.2.0-CIFScredentials2.patch +Patch22: e-smith-backup-2.2.0-moreexcludes.patch +Patch23: e-smith-backup-2.2.0-fullSunday.patch +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.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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -29,8 +67,132 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog +* 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] + +* Sun Jan 31 2010 Stephen Noble 2.2.0-27.sme +- remove comment re smbpasswd being last [SME: 5600] + +* Sun Jan 31 2010 Stephen Noble 2.2.0-26.sme +- Fix mounting usb disks [SME: 4809] + +* Mon Jan 25 2010 Filippo Carletti 2.2.0-25.sme +- Don't backup more than once per day [SME: 5445] + +* Wed Nov 25 2009 Filippo Carletti 2.2.0-24.sme +- Fix full backup on Sunday diplayed as Everyday [SME: 5623] + +* Fri Nov 6 2009 Jonathan Martens 2.2.0-23.sme +- Add more excludes for compressed filetypes [SME: 4765] + +* Wed Aug 26 2009 Jonathan Martens 2.2.0-22.sme +Porting Jean-Paul Leclere changes in the SME Server 7 tree to SME Server 8: +- using credentials file for cifs mount [SME: 5442] +- workstation backup: add cifs credentials expand to bootstrap-console-save [SME: 5442] + +* Sun Jul 26 2009 Jean-Paul Leclere 2.2.0-21.sme +- workstation backup: allow many backups in the same day [SME: 5411] + +* Wed Jul 22 2009 Jean-Paul Leclere 2.2.0-20.sme +- workstation restore: all needed backups must be available before restore [SME: 5397] +- workstation verify: add option to check integrity of backups needed in a full restore [SME: 5405] +- minor fix in translation [SME: 5407] + +* Sun May 17 2009 Jonathan Martens 2.2.0-19.sme +- Fix DAR e-mail message with regards to incremental backups [SME: 4579] + +* Tue Dec 9 2008 Jonathan Martens 2.2.0-18.sme +- Fix discrepancy in maximum compression level [SME: 4841] + +* Wed Oct 29 2008 Shad L. Lords 2.2.0-17.sme +- Fix spelling mistakes in backup panel [SME: 4732] +- Hide password from manager panel [SME: 4734] + +* Tue Oct 28 2008 Shad L. Lords 2.2.0-16.sme +- Migrate smbfs to cifs to complete removal [SME: 4678] + +* Mon Oct 27 2008 Shad L. Lords 2.2.0-15.sme +- Fix compression to default to gzip [SME: 4630] +- Fix uninitialized values in backup [SME: 4720] + +* Sat Oct 25 2008 Stephen Noble 2.2.0-14.sme +- dar backup to be less verbose in panel [SME: 4719] + +* Sat Oct 25 2008 Stephen Noble 2.2.0-13.sme +- correct mounting for usb disks [SME: 4695] + +* Wed Oct 22 2008 Shad L. Lords 2.2.0-12.sme +- Fix from address on email [SME: 4702] + +* Tue Oct 21 2008 Shad L. Lords 2.2.0-11.sme +- Fix patch to remove orig file [SME: 4700] +- Patch dar backup to be less verbose [SME: 4699] + +* Tue Oct 21 2008 Stephen Noble 2.0.0-10.sme +- no compression for ogg media files [SME: 4677] + +* Tue Oct 21 2008 Stephen Noble 2.2.0-8.sme +- replace defined list of directories to backup [SME: 4676] + +* Mon Oct 20 2008 Shad L. Lords 2.2.0-7.sme +- Fix already mounted check [SME: 4688] + +* Mon Oct 20 2008 Shad L. Lords 2.2.0-6.sme +- Remove obsolete smbfs backup method [SME: 4678] + +* Mon Oct 20 2008 Shad L. Lords 2.2.0-5.sme +- Use perl routines for timeout checking [SME: 4660] + +* Thu Oct 16 2008 Shad L. Lords 2.2.0-4.sme +- Make dar use defined list of directories to backup [SME: 4676] + +* Thu Oct 16 2008 Jonathan Martens 2.2.0-3.sme +- Correct translation of CONFIGURATION_TO_BE_DONE to be proper English [SME: 4669] + * Thu Oct 9 2008 Shad L. Lords 2.2.0-2.sme -- Fix localization strings in backup panel [SME: ] +- Fix localization strings in backup panel [SME: 4650] * Tue Oct 7 2008 Shad L. Lords 2.2.0-1.sme - Roll new stream to separate sme7/sme8 trees [SME: 4633] @@ -1039,6 +1201,44 @@ e-smith server central backup administra %prep %setup %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%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 %build /sbin/e-smith/buildtests 10e-smith-backup