--- rpms/e-smith-ibays/sme8/e-smith-ibays.spec	2008/04/27 16:13:22	1.4
+++ rpms/e-smith-ibays/sme8/e-smith-ibays.spec	2008/10/07 18:29:00	1.9
@@ -1,25 +1,20 @@
+# $Id$
+
 Summary: e-smith server and gateway - ibays module
 %define name e-smith-ibays
 Name: %{name}
-%define version 1.2.0
-%define release 9
+%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-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
-Patch5: e-smith-ibays-1.2.0-maxIbayNameLength.patch
-Patch6: e-smith-ibays-1.2.0-add2general.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
@@ -30,8 +25,20 @@ AutoReqProv: no
 e-smith server and gateway software - ibays module.
 
 %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]
+
+* 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
+- 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]
@@ -240,13 +247,6 @@ e-smith server and gateway software - ib
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %pre
 %post