--- rpms/e-smith-base/sme9/e-smith-base.spec 2014/03/07 06:45:08 1.61 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2014/03/21 04:59:51 1.65 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.60 2014/02/16 17:23:41 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.64 2014/03/17 00:29:32 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 58 +%define release 62 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -64,6 +64,9 @@ Patch50: e-smith-base-5.4.0-CipherSuiteU Patch51: e-smith-base-5.4.0-removableMedia.patch Patch52: e-smith-base-5.4.0-consoleBackupRestore.patch Patch53: e-smith-base-5.4.0-performRestoreNonCode.patch +Patch54: e-smith-base-5.4.0-consoleBackupRestore2.patch +Patch55: e-smith-base-5.4.0-removeConsoleSupport.patch +Patch56: e-smith-base-5.4.0-moveConsoleBackup.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -112,6 +115,18 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Thu Mar 20 2014 Ian Wells 5.4.0-62.sme +- Move console backup to e-smith-backup [SME: 3324] + +* Sun Mar 16 2014 Ian Wells 5.4.0-61.sme +- Remove support.pl from e-smith-base and move to smeserver-support [SME: 8264] + +* Sat Mar 15 2014 Ian Wells 5.4.0-60.sme +- Console restore should reboot [SME: 8259] + +* Sat Mar 8 2014 Ian Wells 5.4.0-59.sme +- Boostrap console should only offer restore if no password set [SME: 8259] + * Thu Mar 6 2014 Ian Wells 5.4.0-58.sme - Add restore backup as a console item for freshly installed servers [SME: 8259] - Non-code changes to perform_restore.pm @@ -1774,6 +1789,9 @@ e-smith server and gateway software - ba %patch51 -p1 %patch52 -p1 %patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 # We cannot remove an empy files or folders with a patch, see [SME: 7289] # We remove this because it contains an empty template-begin file