--- rpms/smeserver-remoteuseraccess/contribs7/smeserver-remoteuseraccess-1.2.spec	2007/12/22 21:44:45	1.3
+++ rpms/smeserver-remoteuseraccess/contribs7/smeserver-remoteuseraccess-1.2.spec	2007/12/26 05:51:05	1.7
@@ -1,21 +1,21 @@
-Summary: Smeserver module to configure Shell and FTP and other access for users
+Summary: Smeserver module to configure Shell and FTP access for individual users
 %define name smeserver-remoteuseraccess
 Name: %{name}
 %define version 1.2
-%define release 12
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
-Distribution: SME Server
-License: GPL
+License: GNU GPL version 2
 URL: http://www.dungog.net/sme
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Packager: Stephen Noble <support@dungog.net>
+Patch0: smeserver-remoteuseraccess-fr.patch
+Patch1: smeserver-remoteuseraccess-1.2-frMenu.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-proftpd >= 1.12.0-6
 Requires: e-smith-openssh >= 1.11.0-24
 Requires: perl-CGI-FormMagick >= 0.92-08
 Obsoletes: dungog-proftpd-chroot
@@ -29,11 +29,24 @@ where you can enable shell access on a u
 
 Shells available bash, optionally with sudo
 or rssh which allows scp sftp rsync cvs rdist
+TODO Chroot RSSH shell access.
 
-Also sets Chroots FTP access, VPN Client Access,
-and allows you to enter ssh keys
+Also sets Chroots FTP access, VPN Client Access, 
+and allows you to enter ssh keys  
 
 %changelog
+* Thu Dec 20 2007 Stephen Noble <support@dungog.net>
+- french menu fix 1.2-14
+
+* Thu Dec 20 2007 Stephen Noble <support@dungog.net>
+- french translation, thanks Sylvain 1.2-13
+
+* Wed Jun 13 2007 Stephen Noble <support@dungog.net>
+- apply changes from 1.2-2 to 1.2-12
+
+* Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
+- Clean up spec so package can be built by koji/plague
+
 * Sun Feb 18 2007 Stephen Noble <support@dungog.net>
 - swedish translation, thanks Chrille
 - [1.2-12]
@@ -44,6 +57,10 @@ and allows you to enter ssh keys
 - default set, ftp{ChrootDir} = home
 - [1.2-11]
 
+* Thu Dec 07 2006 Shad L. Lords <slords@mail.com>
+- Update to new release naming.  No functional changes.
+- Make Packager generic
+
 * Thu Nov 23 2006 Stephen Noble <support@dungog.net>
 - chroot path fix when home set [sme 2084]
 - [1.2-10]
@@ -58,7 +75,7 @@ and allows you to enter ssh keys
 - [1.2-8]
 
 * Fri Nov 3 2006 Stephen Noble <support@dungog.net>
-- german translation fix 
+- german translation fix
 - [1.2-7]
 
 * Fri Aug 25 2006 Stephen Noble <support@dungog.net>
@@ -78,23 +95,23 @@ and allows you to enter ssh keys
 - German translation added, thanks Dietmar
 - [1.2-3]
 
-* Mon Apr 24 2006 Stephen Noble <support@dungog.net>
+* Mon Apr 24 2006 Stephen Noble <support@dungog.net> 
 - Description Display fixed
 - [1.2-2]
 
-* Fri Apr 14 2006 Stephen Noble <support@dungog.net>
+* Fri Apr 14 2006 Stephen Noble <support@dungog.net> 
 - FormMagick Version
 - [1.2-1]
 
-* Thu Apr 13 2006 Stephen Noble <support@dungog.net>
+* Thu Apr 13 2006 Stephen Noble <support@dungog.net> 
 - merged sshkeys panel and functions
 - [1.0-13]
 
-* Wed Apr 12 2006 Stephen Noble <support@dungog.net>
+* Wed Apr 12 2006 Stephen Noble <support@dungog.net> 
 - possible fix for Insecure dependency on rc1
 - [1.0-12]
 
-* Wed Apr 12 2006 Stephen Noble <support@dungog.net>
+* Wed Apr 12 2006 Stephen Noble <support@dungog.net> 
 - option to set VPN Client Access
 - uses user-modify event
 - [1.0-11]
@@ -126,28 +143,23 @@ and allows you to enter ssh keys
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks
 
-mkdir -p         root/etc/e-smith/db/configuration/defaults/ftp
-echo "home" >    root/etc/e-smith/db/configuration/defaults/ftp/ChrootDir
+LEXICONS=$(find root/etc/e-smith/{locale/,web/functions/} -type f )
 
-LEXICONS=$(find root/etc/e-smith/locale/ -type f )
-LEXICON2=root/etc/e-smith/web/functions/remoteuseraccess
-LEXICON3=root/etc/e-smith/web/functions/userpanel-sshkeys
-
-for lexicon in $LEXICONS $LEXICON2 $LEXICON3
+for lexicon in $LEXICONS
 do
     /sbin/e-smith/validate-lexicon $lexicon
 done
 
-#de en-us es fr it sv                  FIXME ADD NEW LANGUAGES EACH TIME    ++++++++
+#todo, it
 for LINK in en-us fr de es sv
 do
-#  if [ -z "/etc/e-smith/locale/$LINK/etc/e-smith/web/functions/remoteuseraccess"] ; then
-     /bin/ln -s remoteuseraccess root/etc/e-smith/locale/$LINK/etc/e-smith/web/functions/userpanel-sshkeys
-#  fi
+ /bin/ln -s remoteuseraccess root/etc/e-smith/locale/$LINK/etc/e-smith/web/functions/userpanel-sshkeys
 done
 
 %install
@@ -165,19 +177,11 @@ rm -rf %{name}-%{version}
 %preun
 %post
 
-#/etc/e-smith/events/actions/navigation-conf 2>/dev/null
-
-#if [ -d /etc/e-smith/events/conf-userpanel ] ; then
-#   /sbin/e-smith/signal-event conf-userpanel
-#fi
-
 %postun
 #uninstalls not upgrades
 if [ $1 = 0 ] ; then
- echo "uninstalled remoteuseraccess"
- # /etc/e-smith/events/actions/navigation-conf 2>/dev/null
+ echo "uninstall"
 fi
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-