--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2009/08/26 17:34:27 1.51 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2010/05/14 11:19:46 1.67 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.50 2009/07/26 19:11:42 gnujpl Exp $ +# $Id: e-smith-backup.spec,v 1.66 2010/05/11 11:52:24 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 22 +%define release 36 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -31,6 +31,18 @@ Patch18: e-smith-backup-2.2.0-workstatio 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -49,8 +61,51 @@ Requires: dar Requires: e-smith-formmagick >= 1.4.0-12 %changelog -* Wed Aug 26 2009 Jean-Paul Leclere 2.2.0-22.sme -- workstation backup: using credentials file for cifs mount [SME: 5442] +* 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 @@ -1142,6 +1197,18 @@ e-smith server central backup administra %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 %build /sbin/e-smith/buildtests 10e-smith-backup