--- rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2008/10/07 18:17:02	1.18
+++ rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2010/10/19 17:51:27	1.21
@@ -1,15 +1,17 @@
-# $Id$
+# $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 2.2.0
-%define release 1
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
 Group: Applications/CPAN
 Source0: %{name}-%{version}.tar.gz
+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
@@ -20,6 +22,16 @@ 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]
 
@@ -493,6 +505,8 @@ convenience functions used to create SME
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1
+%patch2 -p1
 
 %build
 # build the test suite from embedded tests