/[smeserver]/rpms/e-smith-backup/sme10/e-smith-backup.spec

Diff of /rpms/e-smith-backup/sme10/e-smith-backup.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.1 by vip-ire,
Thu Feb  4 23:12:12 2016 UTC
+Revision 1.18 by chrissn,
Sun Jun  7 19:52:24 2020 UTC
 Line 1
- # $Id: e-smith-backup.spec,v 1.46 2015/11/28 22:18:12 stephdl Exp $
+ # $Id: e-smith-backup.spec,v 1.17 2020/05/05 22:43:50 jpp 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 17
  Version: %{version}
  Release: %{release}%{?dist}
  License: Artistic
  Group: Networking/Daemons
  Source: %{name}-%{version}.tar.xz
+ Patch0: e-smith-backup-2.6.0-normalreboot.patch
+ Patch1: e-smith-backup-2.6.0.Add_Or_Remove_Path_In_Backup.patch
+ Patch2: e-smith-backup-2.6.0.bz9090.Testing_the_remote_host_parameters.patch
+ Patch3: e-smith-backup-2.6.0.Do_Tar_Exclusion_In_Panel.patch
+ Patch4: e-smith-backup-2.6.0.Do_Dar_Exclusion.patch
+ Patch5: e-smith-backup-2.6.0.Do_Tar_Exclusion_In_the_console.patch
+ Patch6: e-smith-backup-2.6.0.bz9563.UpdateDarCatalogFollowingBackups.patch
+ Patch7: e-smith-backup-2.6.0-bz9550.fixconsolerestore.patch
+ Patch8: e-smith-backup-2.6.0-bz9299-consoleBackupBlockDevice.patch
+ Patch9: e-smith-backup-2.6.0-bz9127-add_lock_feature.patch
+ Patch10: e-smith-backup-2.6.0-add_ai_to_delete_incomplete.patch
+ Patch11: e-smith-backup-2.6.0-blockdev.patch
+ Patch12: e-smith-backup-2.6.0-restore_rewrite.patch
+ Patch13: e-smith-backup-2.6.0-addinclude.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildRequires: e-smith-devtools >= 1.11.0-03
  BuildRequires: gettext
-Line 31 
 Requires: e-smith-formmagick >= 1.4.0-12
+Line 46 
 Requires: e-smith-formmagick >= 1.4.0-12
  Requires: nfs-utils
  %changelog
+ * Sun Jun 7 2020 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-17.sme
+ - Added /etc/backup-data.d to backup paths [SME:10245]
+ * Sun May 3 2020 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-16.sme
+ - Added error handling to restore using pipe pattern from perform_backup [SME:3139]
+ - Made reboot optional after console restore
+ - Fixed bootstrap restore not activating config changes [SME:10921]
+ - Manually added ext2 and ext3 to Block Device file system check where ext4 present
+ * Fri Apr 3 2020 Chris Sansom-Ninnes <chris@sansom.ninnes.net> 2.6.0-14.sme
+ - updated Block Device discovery to fix recovery from console [SME:8244]
+ - Credit to Catton Durbrow
+ * Mon Mar 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk 2.6.0-13.sme
+ - added the '-ai' flag to clean up incomplete files on fail [SME:9159]
+ - Credit to Chris Sansom-Ninnes
+ * Tue Jul 18 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+ - added patch for workstation backup lock [SME: 9127]
+ - code from Stefano Zamboni <zamboni@mind-at-work.it>
+ * Wed Apr 26 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+ - added lock during backup to avoid multiple instance running [SME: 9127]
+ - code from Stefano Zamboni <zamboni@mind-at-work.it>
+ * Fri Apr 14 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+ - added support back to ext2 and ext3 [SME: 9299]
+ * Wed Apr 12 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+ - fix removable device detection [SME: 9299]
+ * Fri Feb 17 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+ - console restoration can be launched again from console [SME: 9550]
+ * Wed Aug 10 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-6.sme
+ - fixed bug on the dar catalog when backups are not added in it [SME: 9563]
+ - Added e-smith-backup-2.6.0.bz9563.UpdateDarCatalogFollowingBackups.patch
+ * Tue Aug 02 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-5.sme
+ - Remove the dar exclusion message in the email if there is no exclusion.
+ - Modified e-smith-backup-2.6.0.Do_Dar_Exclusion.patch [SME: 9633]
+ - Added two commented files backup.{include,exclude} in /etc/backup-data.d
+ - Modified e-smith-backup-2.6.0.Add_Or_Remove_Path_In_Backup.patch [SME: 9607]
+ * Sun Jul 31 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-4.sme
+ - Add or remove path in your backup by a file *.include and *.exclude
+ - Added e-smith-backup-2.6.0.Add_Or_Remove_Path_In_Backup.patch [SME: 9607]
+ - Test if the remote host (cifs/nfs) is up, else save and display a warning.
+ - Added e-smith-backup-2.6.0.bz9090.Testing_the_remote_host_parameters.patch [SME: 9090]
+ - The 'tar backup to desktop' of the backup panel takes consideration of exclusion
+ - Added e-smith-backup-2.6.0.Do_Tar_Exclusion_In_Panel.patch [SME: 9635]
+ - The 'dar workstation backup' of the backup panel takes consideration of exclusion
+ - Added e-smith-backup-2.6.0.Do_Dar_Exclusion.patch [SME: 9633]
+ - The 'tar backup' of the console takes consideration of exclusion and display a page with the exclusion content
+ - e-smith-backup-2.6.0.Do_Tar_Exclusion_In_the_console.patch [SME: 9635]
+ * Thu May 12 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-3.sme
+ - Rebuild for [SME: 9393]
+ * Wed Apr 13 2016 Jean-Philipe Pialasse <tests@pialasse.com> 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 <daniel@firewall-services.com> 2.6.0-1.sme
  - Roll new stream for sme10
-Line 74 
 Requires: nfs-utils
+Line 160 
 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 <esmith@wellsi.com> 2.4.0-30.sme
+ * Tue Mar 11 2014 Ian Wells <esmith@wellsi.com> 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 <esmith@wellsi.com> 2.4.0-29.sme
+ * Mon Mar 10 2014 Ian Wells <esmith@wellsi.com> 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 <esmith@wellsi.com> 2.4.0-28.sme
-Line 125 
 Requires: nfs-utils
+Line 213 
 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 <esmith@wellsi.com> 2.4.0-16.sme
+ * Mon Dec 02 2013 Ian Wells <esmith@wellsi.com> 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 <esmith@wellsi.com> 2.4.0-15.sme
-Line 227 
 Requires: nfs-utils
+Line 316 
 Requires: nfs-utils
  * Sun Nov 21 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-46
  - Do not convert case of SmbShare on database migration [SME: 6387]
- * Sat Oct 10 2010 Ian Wells <esmith@wellsi.com> 2.2.0-45.sme
+ * Sun Oct 10 2010 Ian Wells <esmith@wellsi.com> 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 <esmith@wellsi.com> 2.2.0-44.sme
-Line 260 
 Requires: nfs-utils
+Line 350 
 Requires: nfs-utils
  * Tue May 11 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-35.sme
  - Fix removal of leading slash in storage location [SME: 5928]
- * Thu May 9 2010 Ian Wells <esmith@wellsi.com> 2.2.0-34.sme
+ * Sun May 9 2010 Ian Wells <esmith@wellsi.com> 2.2.0-34.sme
  - Add system name in Workstation Backups email [SME: 5706]
  * Thu May 6 2010 Ian Wells <esmith@wellsi.com> 2.2.0-33.sme
-Line 378 
 Porting Jean-Paul Leclere changes in the
+Line 468 
 Porting Jean-Paul Leclere changes in the
  * Sat Jul 26 2008 Shad L. Lords <slords@mail.com> 1.15.0-19
  - Fix redirect to stderr on check tape cronjob [SME: 4458]
- * Sun Jul 7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.15.0-18
+ * Mon Jul 7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.15.0-18
  - Add common <base> tags to e-smith-formmagick's general [SME: 4286]
  * Sat May 31 2008 Gavin Weight <gweight@gmail.com> 1.15.0-17
-Line 396 
 Porting Jean-Paul Leclere changes in the
+Line 486 
 Porting Jean-Paul Leclere changes in the
  * Tue Mar 25 2008 Shad L. Lords <slords@mail.com> 1.15.0-13
  - Fix localization in restore routine [SME: 3989]
- * Sat Mar 07 2008 Stephen Noble <support@dungog.net> 1.15.0-12
+ * Fri Mar 07 2008 Stephen Noble <support@dungog.net> 1.15.0-12
+   Sat Mar 07 2008 --> Sat Mar 01 2008 or Fri Mar 07 2008 or Sat Mar 08 2008 or ....
  - Remove <br> tag from error msg  [SME: 3989]
- * Sat Mar 07 2008 Stephen Noble <support@dungog.net> 1.15.0-11
+ * Fri Mar 07 2008 Stephen Noble <support@dungog.net> 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 <support@dungog.net> 1.15.0-10
-Line 506 
 Porting Jean-Paul Leclere changes in the
+Line 598 
 Porting Jean-Paul Leclere changes in the
  * Wed Feb 01 2006 Charlie Brady <charlie_brady@mitel.com> 1.13.4-07
  - Add restore-from-disk script. [SME: 615]
- * Sat Dec 25 2005 Gordon Rowell <gordonr@gormand.com.au> 1.13.4-06
+ * Sun Dec 25 2005 Gordon Rowell <gordonr@gormand.com.au> 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 <carletti@mobilia.it> 1.13.4-05
-Line 1220 
 Porting Jean-Paul Leclere changes in the
+Line 1313 
 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 <charlieb@e-smith.com>
+ * Wed Feb 14 2001 Charlie Brady <charlieb@e-smith.com>
+   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.
-Line 1369 
 e-smith server central backup administra
+Line 1463 
 e-smith server central backup administra
  %prep
  %setup
+ %patch0 -p1
+ %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
  %build
  /sbin/e-smith/buildtests 10e-smith-backup
+ %{__mkdir} -p root/etc/backup-data.d
  perl createlinks
  # Extract a new copy of the English .po, though we won't use it for this build

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1