--- rpms/e-smith-base/sme9/e-smith-base.spec 2014/02/16 17:23:41 1.60 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2014/03/17 00:29:32 1.64 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.59 2014/01/29 07:27:55 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.63 2014/03/16 06:23:17 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 57 +%define release 61 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -62,6 +62,10 @@ Patch48: e-smith-base-5.4.0-set_serverna Patch49: e-smith-base-5.4.0-restart_rsyslog.patch Patch50: e-smith-base-5.4.0-CipherSuiteUpdate.patch 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -110,6 +114,19 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* 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 + * Sun Feb 16 2014 Ian Wells 5.4.0-57.sme - Refer to removable media not CDROM in console restore [SME: 8214] @@ -1766,6 +1783,10 @@ e-smith server and gateway software - ba %patch49 -p1 %patch50 -p1 %patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -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