--- rpms/e-smith-manager/sme8/e-smith-manager.spec	2008/10/07 18:44:02	1.14
+++ rpms/e-smith-manager/sme8/e-smith-manager.spec	2010/01/31 11:36:15	1.19
@@ -1,15 +1,19 @@
-# $Id$
+# $Id: e-smith-manager.spec,v 1.18 2009/12/09 20:19:24 charliebrady Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
 %define version 2.2.0
-%define release 1
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch0: e-smith-manager-2.2.0-bug5022.patch
+Patch1: e-smith-manager-2.2.0-unsavedchanges2.patch
+Patch2: e-smith-manager-2.2.0-bug5656.patch
+Patch3: e-smith-manager-2.2.0-display-admin-only-messages-only-for-server-manager.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -20,6 +24,21 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Sun Jan 31 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+- Only display error messages intended for admin in server-manager [SME: 5700]
+
+* Wed Dec  9 2009 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-4.sme
+- Fix css validation errors. [SME: 5656]
+
+* Fri Sep 18 2009 Stephen Noble <support@dungog.net> 2.2.0-4.sme 
+- display reconfigure warning once if UnsavedChanges=yes [SME: 5475]
+
+* Fri Sep 18 2009 Stephen Noble <support@dungog.net> 2.2.0-3.sme 
+- display reconfigure warning if UnsavedChanges=yes [SME: 5475]
+
+* Sun Apr 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
+- Fix misinterpretation of display string [SME: 5022]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -606,6 +625,10 @@ This RPM contributes the navigation bars
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks