--- rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/04/22 09:00:42	1.9
+++ rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/05/05 18:38:49	1.12
@@ -1,4 +1,4 @@
-# $Id: smeserver-userpanels.spec,v 1.8 2008/04/02 15:04:00 slords Exp $
+# $Id: smeserver-userpanels.spec,v 1.11 2008/04/28 23:21:45 slords 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 12
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
 License: GNU GPL version 2
@@ -20,10 +20,13 @@ Patch3: smeserver-userpanels-1.0-pootle.
 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
 
@@ -33,6 +36,13 @@ 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
 
@@ -100,7 +110,9 @@ Delegate creation of users with restrict
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 %build
 LEXICONS=$(find root/etc/e-smith/locale/ -type f )
 for lexicon in $LEXICONS root/etc/e-smith/web/functions/userpanel-{password,forwarding}