--- rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2008/08/07 19:09:57	1.17
+++ rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2010/10/17 15:19:13	1.20
@@ -1,23 +1,17 @@
+# $Id: e-smith-formmagick.spec,v 1.19 2010/02/04 19:06:24 slords Exp $
+
 Summary: e-smith-formmagick Perl modules for web manager i18n
 %define name e-smith-formmagick
 Name: %{name}
-%define version 1.4.0
-%define release 20
+%define version 2.2.0
+%define release 3
 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
-Patch6: e-smith-formmagick-1.4.0-RevertInvalidLocaleReversion.patch
-Patch7: e-smith-formmagick-1.4.0-FixAndMoveRESET_PASSWORD_TITLE.patch
-Patch8: e-smith-formmagick-1.4.0-AddYOUR_ACCOUNT_INVALID.patch
-patch9: e-smith-formmagick-1.4.0-fixPASSWORD_VERIFY_ERROR.patch
+Patch1: e-smith-formmagick-2.2.0-lib64.patch
+Patch2: e-smith-formmagick-2.2.0-ip-fqdn.patch
 BuildRoot: /var/tmp/%{name}-{%version}-%{release}-buildroot/
 Requires: perl-CGI-FormMagick >= 0.92-16.el4.sme
 Requires: perl(WWW::Automate) >= 0.20
@@ -28,6 +22,15 @@ BuildRequires: e-smith-devtools >= 1.6.6
 BuildArchitectures: noarch
 
 %changelog
+* Sun Oct 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-3.sme
+- Update textbox description to also reflect the option of a FQDN [SME: 6296]
+
+* Thu Feb 4 2010 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
+- Update path for 64-bit compatibility [SME: 5756]
+
+* 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]
@@ -498,16 +501,8 @@ convenience functions used to create SME
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 # build the test suite from embedded tests