--- rpms/smeserver-remoteuseraccess/contribs7/smeserver-remoteuseraccess.spec	2008/03/08 04:07:53	1.2
+++ rpms/smeserver-remoteuseraccess/contribs7/smeserver-remoteuseraccess.spec	2008/05/21 20:24:15	1.11
@@ -1,8 +1,12 @@
+# $Id: smeserver-remoteuseraccess.spec,v 1.10 2008/05/05 19:25:53 snetram Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 Summary: Smeserver module to configure Shell and FTP access for individual users
 %define name smeserver-remoteuseraccess
 Name: %{name}
 %define version 1.2
-%define release 17
+%define release 24
 Version: %{version}
 Release: %{release}%{?dist}
 License: GNU GPL version 2
@@ -13,13 +17,19 @@ Patch0: smeserver-remoteuseraccess-fr.pa
 Patch1: smeserver-remoteuseraccess-1.2-frMenu.patch
 Patch2: smeserver-remoteuseraccess-1.2-event-rssh.patch
 Patch3: smeserver-remoteuseraccess-1.2-pootle.patch
+Patch4: smeserver-remoteuseraccess-1.2-locale-2008-03-11.patch
+Patch5: smeserver-remoteuseraccess-1.2-locale-2008-04-01.patch
+Patch6: smeserver-remoteuseraccess-1.2-locale-2008-04-22.patch
+Patch7: smeserver-remoteuseraccess-1.2-add2general.patch
+Patch8: smeserver-remoteuseraccess-1.2-locale-2008-05-05.patch
+Patch9: smeserver-remoteuseraccess-1.2-locale-2008-05-21.patch
 BuildRoot: /var/tmp/e-smith-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
 Requires: e-smith-release >= 7
 Requires: e-smith-proftpd >= 1.12.0-6
 Requires: e-smith-openssh >= 1.11.0-24
-Requires: perl-CGI-FormMagick >= 0.92-08
+Requires: e-smith-formmagick >= 1.4.0-12
 Obsoletes: dungog-proftpd-chroot
 Obsoletes: e-smith-usershellaccess
 Obsoletes: smeserver-sshkeys
@@ -37,6 +47,27 @@ Also sets Chroots FTP access, VPN Client
 and allows you to enter ssh keys  
 
 %changelog
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-24
+- Apply 21 May 2008 locale patch
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-23
+- Apply 5 May 2008 locale patch
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-22
+- Add common <base> tags to e-smith-formmagick's general
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-21
+- Forgot to apply patch
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-20
+- Apply 22 April 2008 locale patch
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 1.2-19
+- Update to UTF-8 translations
+
+* Tue Mar 11 2008 Stephen Noble <support@dungog.net> - 1.2-18
+- update locale 2008-03-11
+
 * Sat Mar 07 2008 Stephen Noble <support@dungog.net> - 1.2-17
 - prepare en lexicons for pootle translations
 
@@ -155,6 +186,12 @@ and allows you to enter ssh keys
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 perl createlinks
@@ -166,10 +203,10 @@ do
     /sbin/e-smith/validate-lexicon $lexicon
 done
 
-#todo, it
-for LINK in en-us fr de es sv
+LINKS=$(find /etc/e-smith/locale/ -type d -maxdepth 1 | sed 's/\/etc\/e-smith\/locale\///')
+for link in $LINKS
 do
- /bin/ln -s remoteuseraccess root/etc/e-smith/locale/$LINK/etc/e-smith/web/functions/userpanel-sshkeys
+ /bin/ln -s remoteuseraccess root/etc/e-smith/locale/$link/etc/e-smith/web/functions/userpanel-sshkeys
 done
 
 %install