--- rpms/e-smith-base/sme8/e-smith-base.spec 2009/05/18 16:24:15 1.74 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2009/11/06 12:29:24 1.78 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.73 2009/02/14 11:10:55 snetram Exp $ +# $Id: e-smith-base.spec,v 1.77 2009/10/24 20:35:32 snetram Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 5 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -14,6 +14,10 @@ Patch1: e-smith-base-5.2.0-sambaRole.pat Patch2: e-smith-base-5.2.0-smartd40.patch Patch3: e-smith-base-5.2.0-usbRev70drive.patch Patch4: e-smith-base-5.2.0-FixLabelArray.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -58,6 +62,18 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* 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] + +* Tue Oct 20 2009 Filippo Carletti 5.2.0-7.sme +- Clean up: remove unused nonetworkdrivers [SME: 5521] + +* Sat Jun 6 2009 Shad L. Lords 5.2.0-6.sme +- Clean up stray symlinks in /lib/modules before depmod [SME: 5336] + * Mon May 18 2009 Gavin Weight 5.2.0-5.sme - Allow for different mdadm output formats for DeviceSize. [SME: 5230] @@ -1296,6 +1312,10 @@ e-smith server and gateway software - ba %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]