--- rpms/e-smith-manager/sme8/e-smith-manager.spec	2008/07/31 16:13:27	1.11
+++ rpms/e-smith-manager/sme8/e-smith-manager.spec	2013/10/12 14:21:31	1.24
@@ -1,29 +1,23 @@
+# $Id: e-smith-manager.spec,v 1.23 2013/10/11 15:11:13 wellsi Exp $
+
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
-%define version 1.14.0
-%define release 19
+%define version 2.2.0
+%define release 10
 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
-Patch14: e-smith-manager-1.14.0-create.patch
-Patch15: e-smith-manager-1.14.0-navigationdb.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
+Patch4: e-smith-manager-2.2.0-remove_empty_p.patch
+Patch5: e-smith-manager-2.2.0-Back.patch
+Patch6: e-smith-manager-2.2.0-remove_mod_ssl.patch
+Patch7: e-smith-manager-2.2.0-login-donate.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -34,7 +28,43 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
-* Tue Jul 1 2008 Shad L. Lords <slords@mail.com> 1.14.0-19
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.2.0-10.sme
+- Correct distro name from SME to SME Server on login page [SME: 7879]
+
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.2.0-9.sme
+- Add donation text to login page, by John Crisp [SME: 7879]
+
+* Sat Jun 8 2013 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-8.sme
+- Do not load mod_ssl [SME: 7663]
+
+* Wed Feb 27 2013 Ian Wells <esmith@wellsi.com> 2.2.0-7.sme
+- Correct processing of server-manager URL [SME: 7037]
+
+* Sat Aug 7 2010 Ian Wells <esmith@wellsi.com> 2.2.0-6.sme
+- Remove empty <p> tag from /etc/e-smith/web/common/foot.tmpl, by Daniel [SME: 5905]
+
+* 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]
 
@@ -622,14 +652,6 @@ This RPM contributes the navigation bars
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
 
 %build
 perl createlinks