--- rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/03/14 10:14:27	1.3
+++ rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/04/22 09:00:42	1.9
@@ -1,8 +1,12 @@
+# $Id: smeserver-userpanels.spec,v 1.8 2008/04/02 15:04:00 slords Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 Summary: Panels to let users to change server settings.
 %define name smeserver-userpanels
 Name: %{name}
 %define version 1.0
-%define release 9
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GNU GPL version 2
@@ -14,9 +18,12 @@ Patch1: smeserver-vacation-1.0-svLocaleP
 Patch2: smeserver-userpanels-1.0-frLocale.patch
 Patch3: smeserver-userpanels-1.0-pootle.patch
 Patch4: smeserver-userpanels-1.0-locale-2008-03-14.patch
+Patch5: smeserver-userpanels-1.0-locale-2008-04-01.patch
+Patch6: smeserver-userpanels-1.0-locale-2008-04-22.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0
+Requires: e-smith-formmagick >= 1.4.0-10
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
@@ -26,6 +33,15 @@ Change password,Forward mail, Backup use
 Delegate creation of users with restrictions.
 
 %changelog
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-12
+- Apply 22 April 2008 locale patch
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 1.0-11
+- Update to UTF-8 translations
+
+* Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.0-10
+- Add requires for e-smith-formmagick for UTF-8 support [SME: 3858]
+
 * Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.0-9
 - update locale 2008-03-14
 
@@ -82,10 +98,12 @@ Delegate creation of users with restrict
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
-LEXICONS=$(find root/etc/e-smith/{locale/,web/functions/} -type f )
-for lexicon in $LEXICONS
+LEXICONS=$(find root/etc/e-smith/locale/ -type f )
+for lexicon in $LEXICONS root/etc/e-smith/web/functions/userpanel-{password,forwarding}
 do
     /sbin/e-smith/validate-lexicon $lexicon
 done