--- rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/03/14 10:19:20	1.5
+++ rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/05/05 18:38:49	1.12
@@ -1,8 +1,12 @@
+# $Id: smeserver-userpanels.spec,v 1.11 2008/04/28 23:21:45 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 10
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
 License: GNU GPL version 2
@@ -14,10 +18,15 @@ 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
+Patch7: smeserver-userpanels-1.0-add2general.patch
+Patch8: smeserver-userpanels-1.0-locale-2008-05-05.patch
+Patch9: smeserver-userpanels-1.0-add2general.patch2
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 7.0
-Requires: e-smith-formmagick >= 1.4.0-10
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 
@@ -27,6 +36,19 @@ Change password,Forward mail, Backup use
 Delegate creation of users with restrictions.
 
 %changelog
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-14
+- Fixed locale issue with button not being translated in password panel
+- Added 5 May 2008 locale patch from the translate engine
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-13
+- Add common <base> tags to e-smith-formmagick's general
+
+* 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]
 
@@ -86,10 +108,14 @@ Delegate creation of users with restrict
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -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