--- rpms/e-smith-backup/sme10/e-smith-backup.spec 2016/02/04 23:12:12 1.1 +++ rpms/e-smith-backup/sme10/e-smith-backup.spec 2016/04/13 15:22:05 1.2 @@ -1,15 +1,16 @@ -# $Id: e-smith-backup.spec,v 1.46 2015/11/28 22:18:12 stephdl Exp $ +# $Id: e-smith-backup.spec,v 1.1 2016/02/04 23:12:12 vip-ire Exp $ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} %define version 2.6.0 -%define release 1 +%define release 2 Version: %{version} Release: %{release}%{?dist} License: Artistic Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch0: e-smith-backup-2.6.0-normalreboot.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -31,6 +32,18 @@ Requires: e-smith-formmagick >= 1.4.0-12 Requires: nfs-utils %changelog +* Wed Apr 13 2016 Jean-Philipe Pialasse 2.6.0-2.sme +- avoid restoration on every reboot[SME: 9436] +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + Thu Feb 14 2001 --> Thu Feb 08 2001 or Wed Feb 14 2001 or Thu Feb 15 2001 or .... + Sat Dec 25 2005 --> Sat Dec 24 2005 or Sun Dec 25 2005 or Sat Dec 31 2005 or .... + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... + Sat Oct 10 2010 --> Sat Oct 09 2010 or Sun Oct 10 2010 or Sat Oct 16 2010 or .... + Tue Dec 02 2013 --> Tue Nov 26 2013 or Mon Dec 02 2013 or Tue Dec 03 2013 or .... + Thu Mar 10 2014 --> Thu Mar 06 2014 or Mon Mar 10 2014 or Thu Mar 13 2014 or .... + Fri Mar 11 2014 --> Fri Mar 07 2014 or Tue Mar 11 2014 or Fri Mar 14 2014 or .... + * Fri Feb 5 2016 Daniel Berteaud 2.6.0-1.sme - Roll new stream for sme10 @@ -74,11 +87,13 @@ Requires: nfs-utils - Update to the latest version of perform_restore [SME: 8259] - Boostrap console should only offer restore if no password set. -* Fri Mar 11 2014 Ian Wells 2.4.0-30.sme +* Tue Mar 11 2014 Ian Wells 2.4.0-30.sme + Fri Mar 11 2014 --> Fri Mar 07 2014 or Tue Mar 11 2014 or Fri Mar 14 2014 or .... - Delete items from dar catalog in descending order [SME: 8129] - Minor non-functional updates based on PerlCritic and review comments -* Thu Mar 10 2014 Ian Wells 2.4.0-29.sme +* Mon Mar 10 2014 Ian Wells 2.4.0-29.sme + Thu Mar 10 2014 --> Thu Mar 06 2014 or Mon Mar 10 2014 or Thu Mar 13 2014 or .... - Move console backup to e-smith-backup [SME: 3324] * Sun Feb 9 2014 Ian Wells 2.4.0-28.sme @@ -125,7 +140,8 @@ Requires: nfs-utils - Workstation Backup, new method to show files being restored is needed when using dar 2.4 [SME: 8058] -* Tue Dec 02 2013 Ian Wells 2.4.0-16.sme +* Mon Dec 02 2013 Ian Wells 2.4.0-16.sme + Tue Dec 02 2013 --> Tue Nov 26 2013 or Mon Dec 02 2013 or Tue Dec 03 2013 or .... - Allow more time for cifs mounts before reporting errors [SME: 8034] * Sat Nov 30 2013 Ian Wells 2.4.0-15.sme @@ -227,7 +243,8 @@ Requires: nfs-utils * 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 +* Sun Oct 10 2010 Ian Wells 2.2.0-45.sme + Sat Oct 10 2010 --> Sat Oct 09 2010 or Sun Oct 10 2010 or Sat Oct 16 2010 or .... - Include disk usage in Workstation Backup email [SME: 6143] * Mon Jul 19 2010 Ian Wells 2.2.0-44.sme @@ -260,7 +277,7 @@ Requires: nfs-utils * 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 +* Sun 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 @@ -378,7 +395,7 @@ Porting Jean-Paul Leclere changes in the * Sat Jul 26 2008 Shad L. Lords 1.15.0-19 - Fix redirect to stderr on check tape cronjob [SME: 4458] -* Sun Jul 7 2008 Jonathan Martens 1.15.0-18 +* Mon Jul 7 2008 Jonathan Martens 1.15.0-18 - Add common tags to e-smith-formmagick's general [SME: 4286] * Sat May 31 2008 Gavin Weight 1.15.0-17 @@ -396,10 +413,12 @@ Porting Jean-Paul Leclere changes in the * Tue Mar 25 2008 Shad L. Lords 1.15.0-13 - Fix localization in restore routine [SME: 3989] -* Sat Mar 07 2008 Stephen Noble 1.15.0-12 +* Fri Mar 07 2008 Stephen Noble 1.15.0-12 + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... - Remove
tag from error msg [SME: 3989] -* Sat Mar 07 2008 Stephen Noble 1.15.0-11 +* Fri Mar 07 2008 Stephen Noble 1.15.0-11 + Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or .... - Move/copy Backup_Desc to Backup_Desc_Dar for 1.15 rel [SME: 4024] * Wed Feb 13 2008 Stephen Noble 1.15.0-10 @@ -506,7 +525,8 @@ Porting Jean-Paul Leclere changes in the * Wed Feb 01 2006 Charlie Brady 1.13.4-07 - Add restore-from-disk script. [SME: 615] -* Sat Dec 25 2005 Gordon Rowell 1.13.4-06 +* Sun Dec 25 2005 Gordon Rowell 1.13.4-06 + Sat Dec 25 2005 --> Sat Dec 24 2005 or Sun Dec 25 2005 or Sat Dec 31 2005 or .... - Don't delete config dbs in pre-restore [SME: 229] * Tue Dec 06 2005 Filippo Carletti 1.13.4-05 @@ -1220,7 +1240,8 @@ Porting Jean-Paul Leclere changes in the - Now rewinds tape before zeroing tape. - Writes 32k of zeroes instead of 10k. -* Thu Feb 14 2001 Charlie Brady +* Wed Feb 14 2001 Charlie Brady + Thu Feb 14 2001 --> Thu Feb 08 2001 or Wed Feb 14 2001 or Thu Feb 15 2001 or .... - [1.2.0-09] - Add conf-backup to bootstrap-console-save. - Don't need templates-user-custom directory now, it's in e-smith-base RPM. @@ -1369,6 +1390,7 @@ e-smith server central backup administra %prep %setup +%patch0 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup