--- rpms/e-smith-ibays/sme8/e-smith-ibays.spec	2008/02/13 22:51:45	1.2
+++ rpms/e-smith-ibays/sme8/e-smith-ibays.spec	2010/11/03 18:55:13	1.14
@@ -1,22 +1,23 @@
+# $Id: e-smith-ibays.spec,v 1.13 2010/11/03 14:00:52 slords Exp $
+
 Summary: e-smith server and gateway - ibays module
 %define name e-smith-ibays
 Name: %{name}
-%define version 1.2.0
+%define version 2.2.0
 %define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-ibays-1.2.0-RecordKey.patch
-Patch1: e-smith-ibays-1.2.0-dynamicindex.patch
-Patch2: e-smith-ibays-1.2.0-warning.patch
-Patch3: e-smith-ibays-1.2.0-tags2general.patch
+Patch1: e-smith-ibays-2.2.0-maxLength.patch
+Patch2: e-smith-ibays-2.2.0-enable-cpu.patch
+Patch3: e-smith-ibays-2.2.0-better-ldap.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.13.15-76
 Requires: perl(CGI::FormMagick)
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 Conflicts: e-smith-apache < 0.1.1
 BuildRequires: perl, perl(Test::Inline)
 BuildRequires: e-smith-devtools >= 1.11.0-03
@@ -27,6 +28,42 @@ AutoReqProv: no
 e-smith server and gateway software - ibays module.
 
 %changelog
+* Wed Nov 3 2010 Shad L. Lords <slords@mail.com> 2.2.0-6.sme
+- Fix cpu critical patch missing ' [SME: 6330]
+
+* Wed Nov 3 2010 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
+- Make cpu calls critical only with ldap{Auth} is enabled [SME: 6330]
+
+* Tue Nov 2 2010 Shad L. Lords <slords@mail.com> 2.2.0-4.sme
+- Always use cpu, do unix if ldap{Auth} is disabled [SME: 6326]
+
+* Mon Nov 1 2010 Shad L. Lords <slords@mail.com> 2.2.0-3.sme
+- Switch to cpu commands if ldap is master [SME: 6326]
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
+- Fix maxIbayNameLength logic [SME: 4457]
+
+* 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]
+
+* Sun Jul 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-12
+- Fix password verify entry text box description [SME: 4460]
+
+* Thu Jul 24 2008 Shad L. Lords <slords@mail.com> 1.2.0-11
+- Really fix faulty patch for maxIbayNameLength [SME: 4457]
+
+* Fri May 9 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-10
+- Fixed faulty patch for maxIbayNameLength [SME: 424]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-9
+- Add common <base> tags to e-smith-formmagick's general [SME: 4283]
+
+* Fri Apr 17 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-8
+- Move maxIbayNameLength from ibays.pm to config DB [SME: 424]
+
+* Mon Apr  7 2008 Charlie Brady <charlie_brady@mitel.com> 1.2.0-7
+- Include index.shtml in DirectoryIndex list.[SME: 4180]
+
 * Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.2.0-6
 - Remove <base> tags now in general [SME: 3924]
 
@@ -228,7 +265,6 @@ e-smith server and gateway software - ib
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1