--- rpms/e-smith-base/sme8/e-smith-base.spec 2009/10/24 20:35:32 1.77 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/01/14 12:10:20 1.80 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.76 2009/10/20 13:59:20 filippocarletti Exp $ +# $Id: e-smith-base.spec,v 1.79 2009/11/23 18:47:55 bytegw Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 8 +%define release 11 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -17,6 +17,9 @@ Patch4: e-smith-base-5.2.0-FixLabelArray Patch5: e-smith-base-5.2.0-straysymlink.patch Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch Patch7: e-smith-base-5.2.0-checkIPOverlap.patch +Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch +Patch9: e-smith-base-5.2.0-FixLocale_External.patch +Patch10: e-smith-base-5.2.0-perform_restore-hal.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -61,6 +64,15 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Thu Jan 14 2010 Filippo Carletti 5.2.0-11.sme +- Fix console restore from removable media (Federico Simoncelli) [SME: 5521] + +* Mon Nov 23 2009 Gavin Weight 5.2.0-10.sme +- Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571] + +* Fri Nov 6 2009 Jonathan Martens 5.2.0-9.sme +- Translate $ifName in console configuration pages [SME: 5571] + * Sat Oct 24 2009 Jonathan Martens 5.2.0-8.sme - Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501] @@ -1311,6 +1323,9 @@ e-smith server and gateway software - ba %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]