--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/06/05 14:35:09 1.91 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/06/11 07:39:39 1.94 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.90 2010/05/11 04:00:39 mrjhb3 Exp $ +# $Id: e-smith-base.spec,v 1.93 2010/06/08 19:43:47 snetram Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 21 +%define release 24 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -27,7 +27,8 @@ Patch14: e-smith-base-5.2.0-sha1.patch Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch Patch16: e-smith-base-5.2.0-gettext.patch Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch -Patch18: e-smith-base-5.2.0-checkMaxUsers.patch +Patch18: e-smith-base-5.2.0-no-nic.patch +Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -73,6 +74,15 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Jun 11 2010 Ian Wells 5.2.0-24.sme +- Remove checkMaxUsers patch due to regression. [SME: 5537] + +* Tue Jun 8 2010 Jonathan Martens 5.2.0-23.sme +- Fix translation of local nic string in console [SME: 5571] + +* Sun Jun 6 2010 Jonathan Martens 5.2.0-22.sme +- Handle no network interface scenario in console [SME: 6023] + * Sat Jun 5 2010 Ian Wells 5.2.0-21.sme - Remove checkMaxUsers(). [SME: 5537] @@ -1373,6 +1383,7 @@ e-smith server and gateway software - ba %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]