--- rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2008/04/25 14:02:29	1.8
+++ rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2010/10/19 17:51:27	1.21
@@ -1,19 +1,17 @@
+# $Id: e-smith-formmagick.spec,v 1.20 2010/10/17 15:19:13 snetram 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 12
+%define version 2.2.0
+%define release 4
 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
+Patch1: e-smith-formmagick-2.2.0-lib64.patch
+Patch2: e-smith-formmagick-2.2.0-ip-fqdn-new.patch
 BuildRoot: /var/tmp/%{name}-{%version}-%{release}-buildroot/
 Requires: perl-CGI-FormMagick >= 0.92-16.el4.sme
 Requires: perl(WWW::Automate) >= 0.20
@@ -24,11 +22,52 @@ BuildRequires: e-smith-devtools >= 1.6.6
 BuildArchitectures: noarch
 
 %changelog
+* Tue Oct 19 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-4.sme
+- Revert previous change as it might cause regression in contribs [SME: 6296]
+- Add additional locale string [SME: 6296]
+
+* 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]
+- 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
+
+* Sun Jul 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-16
+- Fix password verify entry text box description in ibays panel entry 
+  in e-smith-formmagick's general [SME: 4460]
+
+* Tue Jul 8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-15
+- Moving single occurence for HOSTTYPE back to e-smith-hosts
+
+* Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-14
+- Added missing entry to general [SME: 4289]
+
+* Mon Apr 28 2008 Shad L. Lords <slords@mail.com> 1.4.0-13
+- Bump release to allow rebuild
+
 * Fri Apr 25 2008 Shad L. Lords <slords@mail.com> 1.4.0-12
 - Update requires to really pull in perl-CGI-FormMagick [SME: 4269]
 
 * Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-11
-- And more common <base> entries to general
+- And more common <base> entries to general [SME: 4289]
 
 * Mon Mar 10 2008 Shad L. Lords <slords@mail.com> 1.4.0-10
 - Default charset to UTF-8 unless specified [SME: 3858]
@@ -466,12 +505,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
 
 %build
 # build the test suite from embedded tests
@@ -496,4 +531,3 @@ echo "%doc LICENSE" >> %{name}-%{version
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
-