--- rpms/smeserver-geneweb/contribs7/smeserver-geneweb.spec	2008/01/13 18:35:46	1.5
+++ rpms/smeserver-geneweb/contribs7/smeserver-geneweb.spec	2008/03/12 07:03:43	1.7
@@ -2,13 +2,15 @@ Summary: Package to integrate GeneWeb (V
 %define name smeserver-geneweb
 Name: %{name}
 %define version 2.0 
-%define release 4
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Applications/Internet
 Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-geneweb-2.0-pod-corrections.patch
+Patch2: smeserver-geneweb-2.0-ip_number-validation.patch
+Patch3: smeserver-geneweb-2.0-locale-2008-03-11.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: geneweb >= 5.00
@@ -20,6 +22,12 @@ This RPM must be installed after the gen
 to complete the integration for SME Server.
 
 %changelog
+* Tue Mar 11 2008 Stephen Noble <support@dungog.net> - 2.0-6
+- add locale patch, validate lexicon in spec
+
+* Tue Jan 15 2008 Craig Jensen <craig.d.jensen@gmail.com> 2.0-5
+- geneweb.pm fix to correctly validate IP numbers 'and' localIP
+
 * Sun Jan 13 2008 Craig Jensen <craig.d.jensen@gmail.com> 2.0-4
 - geneweb.pm edited for pod corrections (pass podchecker)
 
@@ -34,6 +42,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks
@@ -43,6 +53,12 @@ echo "service" > $DEFAULTS/type
 echo "disabled" > $DEFAULTS/status
 echo "127.0.0.1" >$DEFAULTS/only
 
+LEXICONS=$(find root/etc/e-smith/{locale/,web/functions/} -type f )
+for lexicon in $LEXICONS
+do
+    /sbin/e-smith/validate-lexicon $lexicon
+done
+
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)