--- rpms/e-smith-manager/sme8/e-smith-manager.spec	2007/06/12 19:07:38	1.1
+++ rpms/e-smith-manager/sme8/e-smith-manager.spec	2008/10/07 18:44:02	1.14
@@ -1,29 +1,70 @@
+# $Id$
+
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
-%define version 1.14.0
-%define release 7
+%define version 2.2.0
+%define release 1
 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
 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
+* 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]
+
+* Mon Mar 31 2008 Shad L. Lords <slords@mail.com> 1.14.0-16
+- Remove navigation dbs and create new [SME: 4147]
+
+* Fri Mar 28 2008 Shad L. Lords <slords@mail.com> 1.14.0-15
+- Remove last remnant of pleasewait [SME: 4130]
+
+* Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 1.14.0-14
+- Include general lexicons in nav-config [SME: 4113]
+
+* Tue Mar 25 2008 Shad L. Lords <slords@mail.com> 1.14.0-13
+- Fix wide output to print in navigation and allow navigations db to
+  be utf8 [SME: 4101]
+
+* Sat Mar 22 2008 Shad L. Lords <slords@mail.com> 1.14.0-12
+- Fix UTF-8 encoding in header and nav-conf [SME: 4072]
+
+* Tue Jan 08 2008 Stephen Noble <support@dungog.net> 1.14.0-11
+- Fix to remove spaces and newlines in panel headers [SME: 3346] 
+
+* Tue Jan 08 2008 Stephen Noble <support@dungog.net> 1.14.0-10
+- remove the FormMagick session files [SME: 3723]
+
+* Tue Jan 08 2008 Stephen Noble <support@dungog.net> 1.14.0-9
+- Remove spaces and newlines in panel headers [SME: 3346] 
+
+* Sun Jul 01 2007 Shad L. Lords <slords@mail.com> 1.14.0-8
+- Make login/logout no quite so verbose. [SME: 2660]
+
 * Fri May 18 2007 Shad L. Lords <slords@mail.com> 1.14.0-7
 - Use correct lib for modules
 
@@ -565,12 +606,6 @@ This RPM contributes the navigation bars
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 perl createlinks
@@ -635,6 +670,11 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 %preun
 %post
+find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \
+    sed -n '/\/[0-9a-z]\{32\}$/p' | \
+    xargs grep -l Persisten | \
+    xargs rm -f
+
 %postun
 
 %files -f %{name}-%{version}-%{release}-filelist