--- rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2008/02/10 12:17:47	1.3
+++ rpms/e-smith-formmagick/sme8/e-smith-formmagick.spec	2008/04/25 14:02:29	1.8
@@ -2,7 +2,7 @@ Summary: e-smith-formmagick Perl modules
 %define name e-smith-formmagick
 Name: %{name}
 %define version 1.4.0
-%define release 8
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -11,21 +11,36 @@ 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.91-28
+Requires: perl-CGI-FormMagick >= 0.92-16.el4.sme
 Requires: perl(WWW::Automate) >= 0.20
 Requires: perl(Crypt::Cracklib)
 Requires: perl(I18N::LangTags) >= 0.27
-Requires: e-smith-lib >= 1.13.1-07
+Requires: e-smith-lib >= 1.18.0-21
 BuildRequires: e-smith-devtools >= 1.6.6
 BuildArchitectures: noarch
 
 %changelog
+* 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
+
+* Mon Mar 10 2008 Shad L. Lords <slords@mail.com> 1.4.0-10
+- Default charset to UTF-8 unless specified [SME: 3858]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.4.0-9
+- And more common <base> entries to general [SME: 3886]
+
 * Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.4.0-8
 - Added more common <base> entries to general [SME: 3886]
 
 * Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.4.0-7
-- Added header <base> entries to general [SME: 3896]
+- Added header <base> entries to general [SME: 3886]
 
 * Thu Nov 08 2007 Gavin Weight <gweight@gmail.com> 1.4.0-6
 - Remove/Fix Formmagick.pm.orig file. [SME: 3526]
@@ -454,6 +469,9 @@ convenience functions used to create SME
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 # build the test suite from embedded tests