--- rpms/e-smith-lib/sme8/e-smith-lib.spec	2008/01/21 17:54:06	1.5
+++ rpms/e-smith-lib/sme8/e-smith-lib.spec	2008/10/13 21:48:13	1.18
@@ -1,37 +1,22 @@
+# $Id: e-smith-lib.spec,v 1.17 2008/10/07 18:41:10 slords Exp $
+
 Summary: e-smith server and gateway - library module
 %define name e-smith-lib
 Name: %{name}
-%define version 1.18.0
-%define release 20
+%define version 2.2.0
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-lib-1.18.0-backtitle.patch
-Patch2: e-smith-lib-1.18.0-infobox.patch
-Patch3: e-smith-lib-1.18.0-password_page.patch
-Patch4: e-smith-lib-1.18.0-clear.patch
-Patch5: e-smith-lib-1.18.0-clear.patch2
-Patch6: e-smith-lib-1.18.0-infobox.patch2
-Patch7: e-smith-lib-1.18.0-gauge.patch
-Patch8: e-smith-lib-1.18.0-templates.metadata.patch
-Patch9: e-smith-lib-1.18.0-templates.metadata.patch2
-Patch10: e-smith-lib-1.18.0-logfile_rotation.patch
-Patch11: e-smith-lib-1.18.0-generic_template_expand.patch
-Patch12: e-smith-lib-1.18.0-gauge.patch2
-Patch13: e-smith-lib-1.18.0-shift64.patch
-Patch14: e-smith-lib-1.18.0-passlength.patch
-Patch15: e-smith-lib-1.18.0-generic_template_expand.patch2
-Patch16: e-smith-lib-1.18.0-FixFileDescriptorLeak.patch
-Patch17: e-smith-lib-1.18.0-validatePassword.patch
-Patch18: e-smith-lib-1.18.0-re_enable_locked_user.patch
+Patch1: e-smith-lib-2.2.0-sambaRole.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.6.3-01
 Obsoletes: %{name}-Tai64n
+Obsoletes: whiptail
 Requires: dialog
-Requires: whiptail
 Requires: perl, perl(Text::Template)
 Requires: perl(Time::HiRes), perl(MIME::Base64)
 Requires: perl(Authen::PAM), perl(I18N::AcceptLanguage)
@@ -42,6 +27,42 @@ Requires: perl(Net::IPv4Addr) >= 0.10
 e-smith server and gateway software - library module.
 
 %changelog
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
+- Add patch to support multiple samba roles [SME: 4172]
+
+* 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]
+
+* Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 1.19.0-1
+- Roll new dev stream.
+
+* Sat Aug 9 2008 Shad L. Lords <slords@mail.com> 1.18.0-28
+- Read /dev/urandmon instead of /dev/random [SME: 4492]
+
+* Sat Aug 9 2008 Shad L. Lords <slords@mail.com> 1.18.0-27
+- Make dialog not use STDERR for return values [SME: 3663]
+- Remove requires for whiptail.  No longer needed [SME: 4491]
+
+* Thu Jul 31 2008 Shad L. Lords <slords@mail.com> 1.18.0-26
+- Make binmode properties of db class [SME: 4317]
+- Add new navigation db & utf8 classes [SME: 4317]
+
+* Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 1.18.0-25
+- Add .utf8 to locale unless server-console [SME: 4162]
+- Add new languages to langtag2locale [SME: 4163]
+
+* Sun Mar 30 2008 Shad L. Lords <slords@mail.com> 1.18.0-24
+- Gracefully handle encoding errors in navigation dbs [SME: 4147]
+
+* Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 1.18.0-23
+- Make PAM conv routine not look for english strings [SME: 4117]
+
+* Tue Mar 25 2008 Shad L. Lords <slords@mail.com> 1.18.0-22
+- Fix wide output to syslog and allow navigations db to be utf8 [SME: 4101]
+
+* Mon Mar 10 2008 Shad L. Lords <slords@mail.com> 1.18.0-21
+- Output navigation in UTF-8 [SME: 3858]
+
 * Sun Jan 20 2008 Gavin Weight <gweight@gmail.com> 1.18.0-20
 - Call smbpasswd -e - to reset user correctly. [SME: 3755]
 
@@ -705,23 +726,6 @@ e-smith server and gateway software - li
 %prep
 %setup
 %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
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
 
 %pre
 # Remove legacy symlink if one exists