--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/03/03 13:51:14 1.89 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/06/11 13:21:14 1.95 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.88 2010/03/01 19:02:20 slords Exp $ +# $Id: e-smith-base.spec,v 1.94 2010/06/11 07:39:39 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 19 +%define release 25 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -26,6 +26,10 @@ Patch13: e-smith-base-5.2.0-hwaddress.pa 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-no-nic.patch +Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch +Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -71,6 +75,24 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Jun 11 2010 Federico Simoncelli 5.2.0-25.sme +- FreeBusy patch fix (save account changes) [SME: 5941] + +* 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] + +* Mon May 10 2010 John H. Bennett III 5.2.0-20.sme +- Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941] + * Wed Mar 3 2010 Federico Simoncelli 5.2.0-19.sme - Restate smartd dependency. [SME: 5814] @@ -1363,6 +1385,10 @@ e-smith server and gateway software - ba %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]