--- 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	2008/08/07 19:09:57	1.17
@@ -2,7 +2,7 @@ Summary: e-smith-formmagick Perl modules
 %define name e-smith-formmagick
 Name: %{name}
 %define version 1.4.0
-%define release 12
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -14,6 +14,10 @@ Patch2: e-smith-formmagick-1.4.0-add2gen
 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
 BuildRoot: /var/tmp/%{name}-{%version}-%{release}-buildroot/
 Requires: perl-CGI-FormMagick >= 0.92-16.el4.sme
 Requires: perl(WWW::Automate) >= 0.20
@@ -24,11 +28,39 @@ BuildRequires: e-smith-devtools >= 1.6.6
 BuildArchitectures: noarch
 
 %changelog
+* 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]
@@ -472,6 +504,10 @@ convenience functions used to create SME
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 # build the test suite from embedded tests
@@ -496,4 +532,3 @@ echo "%doc LICENSE" >> %{name}-%{version
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
-