--- rpms/e-smith-manager/sme8/e-smith-manager.spec	2008/05/15 13:38:34	1.9
+++ rpms/e-smith-manager/sme8/e-smith-manager.spec	2010/01/31 11:36:15	1.19
@@ -1,38 +1,58 @@
+# $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 1.14.0
-%define release 17
+%define version 2.2.0
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-manager-1.14.0.module_list.patch
-Patch1: e-smith-manager-1.14.0.tktdomain.patch
-Patch2: e-smith-manager-1.14.0.tktdomain.patch2
-Patch3: e-smith-manager-1.14.0-formrestyling.patch
-Patch4: e-smith-manager-1.14.0-tktport80.patch
-Patch5: e-smith-manager-1.14.0-lib64.patch
-Patch6: e-smith-manager-1.14.0-nowarnings.patch
-Patch7: e-smith-manager-1.14.0-lexiconSpaces.patch2
-Patch8: e-smith-manager-1.14.0-utf8.patch
-Patch9: e-smith-manager-1.14.0-utf8.patch2
-Patch10: e-smith-manager-1.14.0-generalnav.patch
-Patch11: e-smith-manager-1.14.0-pleasewait.patch
-Patch12: e-smith-manager-1.14.0-navdbfix.patch
-Patch13: e-smith-manager-1.14.0-encoding.patch
+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
 BuildArchitectures: noarch
-Requires: e-smith-lib >= 1.14.0
+Requires: e-smith-lib >= 1.18.0-26
 Requires: mod_auth_tkt
 Provides: server-manager
 AutoReqProv: no
 
 %changelog
-* Mon Mar 31 2008 Shad L. Lords <slords@mail.com> 1.14.0-17
+* 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]
+
+* Sat Oct 4 2008 Shad L. Lords <slords@mail.com> 1.14.0-20
+- Make navigation use new db class for navigation [SME: 4619]
+
+* Thu Jul 31 2008 Shad L. Lords <slords@mail.com> 1.14.0-19
+- Make binmode properties of db class [SME: 4317]
+- Add new navigation db & utf8 classes [SME: 4317]
+
+* Tue Jul 1 2008 Shad L. Lords <slords@mail.com> 1.14.0-18
+- Fix open of database to create if necessary [SME: 4147]
+
+* Tue May 15 2008 Shad L. Lords <slords@mail.com> 1.14.0-17
 - No longer remove navigation dbs. [SME: 4147]
 - Deal a little more gracefully with non UTF-8 lexicons [SME: 4229]
 
@@ -609,16 +629,6 @@ This RPM contributes the navigation bars
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %build
 perl createlinks