--- rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/04/26 19:52:26	1.10
+++ rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/06/27 15:16:07	1.15
@@ -1,4 +1,4 @@
-# $Id: smeserver-userpanels.spec,v 1.9 2008/04/22 09:00:42 snetram Exp $
+# $Id: smeserver-userpanels.spec,v 1.14 2008/05/21 20:32:17 snetram Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
@@ -6,7 +6,7 @@ Summary: Panels to let users to change s
 %define name smeserver-userpanels
 Name: %{name}
 %define version 1.0
-%define release 13
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GNU GPL version 2
@@ -21,10 +21,14 @@ Patch4: smeserver-userpanels-1.0-locale-
 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
+Patch10: smeserver-userpanels-1.0-locale-2008-05-21.patch
+Patch11: smeserver-userpanels-1.0-locale-2008-06-27.patch
 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
 
@@ -34,6 +38,16 @@ Change password,Forward mail, Backup use
 Delegate creation of users with restrictions.
 
 %changelog
+* Fri Jun 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-16
+- Apply 27 Jun 2008 locale patch
+
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-15
+- Apply 21 May 2008 locale patch
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-14
+- Fixed locale issue with button not being translated in password panel [SME: 4310]
+- 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
 
@@ -105,6 +119,11 @@ Delegate creation of users with restrict
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+
 %build
 LEXICONS=$(find root/etc/e-smith/locale/ -type f )
 for lexicon in $LEXICONS root/etc/e-smith/web/functions/userpanel-{password,forwarding}