--- rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/04/26 19:52:26	1.10
+++ rpms/smeserver-userpanels/contribs7/smeserver-userpanels.spec	2008/11/30 22:08:26	1.24
@@ -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.23 2008/11/25 16:20:33 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 13
+%define release 22
 Version: %{version}
 Release: %{release}%{?dist}
 License: GNU GPL version 2
@@ -21,10 +21,20 @@ 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
+Patch12: smeserver-userpanels-1.0-locale-2008-07-01.patch
+Patch13: smeserver-userpanels-1.0-locale-2008-09-27.patch
+Patch14: smeserver-userpanels-1.0-locale-2008-10-14.patch
+Patch15: smeserver-userpanels-1.0-locale-2008-10-15.patch
+Patch16: smeserver-userpanels-1.0-locale-2008-10-16.patch
+Patch17: smeserver-userpanels-1.0-locale-2008-11-30.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 +44,34 @@ Change password,Forward mail, Backup use
 Delegate creation of users with restrictions.
 
 %changelog
+* Sun Nov 30 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-22
+- Apply 30 Nov 2008 locale patch
+
+* Thu Oct 16 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-21
+- Apply 16 Oct 2008 locale patch
+
+* Wed Oct 15 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-20
+- Apply 15 Oct 2008 locale patch
+
+* Tue Oct 14 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-19
+- Apply 14 Oct 2008 locale patch
+
+* Sat Sep 27 2008 Stephen Noble <support@dungog.net> - 1.2-26
+- Apply locale patch
+
+* Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-17
+- Apply 1 July 2008 locale patch
+
+* 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 +143,17 @@ Delegate creation of users with restrict
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+
 %build
 LEXICONS=$(find root/etc/e-smith/locale/ -type f )
 for lexicon in $LEXICONS root/etc/e-smith/web/functions/userpanel-{password,forwarding}