--- rpms/e-smith-base/sme8/e-smith-base.spec	2010/06/06 07:34:55	1.92
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2010/07/20 00:20:46	1.96
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.91 2010/06/05 14:35:09 wellsi Exp $
+# $Id: e-smith-base.spec,v 1.95 2010/06/11 13:21:14 filippocarletti Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.2.0
-%define release 22
+%define release 26
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -27,8 +27,10 @@ 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
-Patch19: e-smith-base-5.2.0-no-nic.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
+Patch21: e-smith-base-5.2.0-condrestart.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 2.2.0-2
@@ -74,6 +76,19 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
+- Don't exit 99 from e-smith-service script when called with 'condrestart'
+  and service is disabled. [SME: 5830]
+
+* Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
+- FreeBusy patch fix (save account changes) [SME: 5941]
+
+* Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
+- Remove checkMaxUsers patch due to regression. [SME: 5537] 
+
+* Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
+- Fix translation of local nic string in console [SME: 5571]
+
 * Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
 - Handle no network interface scenario in console [SME: 6023]
 
@@ -1378,6 +1393,8 @@ e-smith server and gateway software - ba
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]