--- rpms/e-smith-ibays/sme8/e-smith-ibays.spec	2008/04/11 21:39:26	1.3
+++ rpms/e-smith-ibays/sme8/e-smith-ibays.spec	2010/11/02 17:07:31	1.11
@@ -1,23 +1,22 @@
+# $Id: e-smith-ibays.spec,v 1.10 2008/10/13 20:02:28 slords Exp $
+
 Summary: e-smith server and gateway - ibays module
 %define name e-smith-ibays
 Name: %{name}
-%define version 1.2.0
-%define release 7
+%define version 2.2.0
+%define release 3
 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
-Patch4: e-smith-ibays-1.2.0-shtml.patch
+Patch1: e-smith-ibays-2.2.0-maxLength.patch
+Patch2: e-smith-ibays-2.2.0-enable-cpu.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
@@ -28,6 +27,30 @@ AutoReqProv: no
 e-smith server and gateway software - ibays module.
 
 %changelog
+* 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]
 
@@ -232,11 +255,8 @@ e-smith server and gateway software - ib
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %pre
 %post