--- rpms/e-smith-base/sme8/e-smith-base.spec 2013/01/30 06:06:59 1.140 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2013/03/01 04:06:17 1.145 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.139 2013/01/23 03:47:15 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.144 2013/02/21 19:19:22 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 68 +%define release 73 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -64,6 +64,10 @@ Patch51: e-smith-base-5.2.0-ConsoleNetwo Patch52: e-smith-base-5.2.0-CipherSuite.patch Patch53: e-smith-base-5.2.0-updatedb.patch Patch54: e-smith-base-5.2.0-pppoeMlimit.patch +Patch55: e-smith-base-5.2.0-PostUpgradeRestore.patch +Patch56: e-smith-base-5.2.0-optimize_user_modify_unix.patch +Patch57: e-smith-base-5.2.0-user_modify_in_bootstrap.patch +Patch58: e-smith-base-5.2.0-ConsoleBackupText.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -111,6 +115,21 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Thu Feb 28 2013 Terry Fage 5.2.0-73.sme +- In the console refer to removable media instead of USB disk [SME: 6835] + +* Thu Feb 21 2013 Daniel Berteaud 5.2.0-72.sme +- Optimize user-modify-unix script and link it in bootstrap-ldap-save [SME: 7167] + +* Tue Feb 5 2013 John Crisp 5.2.0-71.sme +- Post-upgrades not fired after restore from console [SME: 7060] + +* Mon Feb 4 2013 Ian Wells 5.2.0-70.sme +- Correction for when DB value is lower than MIN_MEMORY_LIMIT [SME: 7000] + +* Sat Feb 2 2013 Ian Wells 5.2.0-69.sme +- Simplified patch after review comments [SME: 7000] + * Tue Jan 29 2013 Ian Wells 5.2.0-68.sme - Updated previous patch to avoid migrate fragment [SME: 7000] @@ -1594,6 +1613,10 @@ e-smith server and gateway software - ba %patch52 -p1 %patch53 -p1 %patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] @@ -1699,8 +1722,6 @@ do ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service done -mkdir -p root/var/service/wan/env.pppoe - # Remove (for now) supervised syslog and klogd services rm root/etc/rc.d/init.d/supervise/{syslog,klogd} rm root/service/{syslog,klogd}