--- rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2008/07/27 20:49:27	1.14
+++ rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2008/10/07 18:17:02	1.18
@@ -1,19 +1,15 @@
+# $Id$
+
 Summary: e-smith-formmagick Perl modules for web manager i18n
 %define name e-smith-formmagick
 Name: %{name}
-%define version 1.4.0
-%define release 17
+%define version 2.2.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
 Group: Applications/CPAN
 Source0: %{name}-%{version}.tar.gz
-Patch0: e-smith-formmagick-1.4.0-passlength.patch
-Patch1: e-smith-formmagick-1.4.0-headers.patch
-Patch2: e-smith-formmagick-1.4.0-add2general.patch
-Patch3: e-smith-formmagick-1.4.0-add2general.patch2
-Patch4: e-smith-formmagick-1.4.0-UTF8.patch
-Patch5: e-smith-formmagick-1.4.0-add2general.patch3
 BuildRoot: /var/tmp/%{name}-{%version}-%{release}-buildroot/
 Requires: perl-CGI-FormMagick >= 0.92-16.el4.sme
 Requires: perl(WWW::Automate) >= 0.20
@@ -24,6 +20,20 @@ BuildRequires: e-smith-devtools >= 1.6.6
 BuildArchitectures: noarch
 
 %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]
+
+* Thu Aug  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-20
+- Move RESET_PASSWORD_TITLE to general [SME: 4475]
+- Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476]
+- Add YOUR_ACCOUNT_INVALID to general [SME: 4478]
+
+* Tue Aug  5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-19
+- Revert previous invalid locale changes (reverting to 1.4.0-17) [SME: 4472]
+
+* Mon Aug  4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-18
+- Reverting some locale changes
+
 * Sun Jul 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-17
 - Revert patch here and fix in e-smith-ibays instead because of multiple 
   dependencies and incorrect naming scheme
@@ -483,12 +493,6 @@ convenience functions used to create SME
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 # build the test suite from embedded tests