--- rpms/smeserver-remoteuseraccess/contribs7/smeserver-remoteuseraccess.spec	2008/04/22 09:11:45	1.6
+++ rpms/smeserver-remoteuseraccess/contribs7/smeserver-remoteuseraccess.spec	2009/03/01 19:28:19	1.20
@@ -1,4 +1,4 @@
-# $Id: smeserver-remoteuseraccess.spec,v 1.5 2008/04/02 15:03:59 slords Exp $
+# $Id: smeserver-remoteuseraccess.spec,v 1.19 2009/01/01 11:41:15 snetram Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
@@ -6,7 +6,7 @@ Summary: Smeserver module to configure S
 %define name smeserver-remoteuseraccess
 Name: %{name}
 %define version 1.2
-%define release 20
+%define release 30
 Version: %{version}
 Release: %{release}%{?dist}
 License: GNU GPL version 2
@@ -20,13 +20,22 @@ Patch3: smeserver-remoteuseraccess-1.2-p
 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
+Patch10: smeserver-remoteuseraccess-1.2-locale-2008-07-01.patch
+Patch11: smeserver-remoteuseraccess-1.2-locale-2008-09-27.patch
+Patch12: smeserver-remoteuseraccess-1.2-locale-2008-10-14.patch
+Patch13: smeserver-remoteuseraccess-1.2-locale-2008-11-30.patch
+Patch14: smeserver-remoteuseraccess-1.2-locale-2009-01-01.patch
+Patch15: smeserver-remoteuseraccess-1.2-locale-2009-03-01.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: e-smith-formmagick >= 1.4.0-10
+Requires: e-smith-formmagick >= 1.4.0-12
 Obsoletes: dungog-proftpd-chroot
 Obsoletes: e-smith-usershellaccess
 Obsoletes: smeserver-sshkeys
@@ -44,6 +53,36 @@ Also sets Chroots FTP access, VPN Client
 and allows you to enter ssh keys  
 
 %changelog
+* Sun Mar  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-30
+- Apply  1 Mar 2009 locale patch [SME: 5018]
+
+* Thu Jan  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-29
+- Apply  1 Jan 2009 locale patch [SME: 4900]
+
+* Sun Nov 30 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-28
+- Apply 30 Nov 2008 locale patch
+
+* Tue Oct 14 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-27
+- 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.2-25
+- Apply 1 July 2008 locale patch
+
+* 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
 
@@ -173,6 +212,16 @@ and allows you to enter ssh keys
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 perl createlinks
@@ -184,7 +233,7 @@ do
     /sbin/e-smith/validate-lexicon $lexicon
 done
 
-LINKS=$(find /etc/e-smith/locale/ -type d -maxdepth 1 | sed 's/\/etc\/e-smith\/locale\///')
+LINKS=$(find root/etc/e-smith/locale/ -type d -maxdepth 1 | sed 's/root\/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