--- rpms/smeserver-geneweb/contribs7/smeserver-geneweb.spec	2007/12/25 00:06:10	1.1
+++ rpms/smeserver-geneweb/contribs7/smeserver-geneweb.spec	2008/03/12 15:11:18	1.8
@@ -2,24 +2,39 @@ Summary: Package to integrate GeneWeb (V
 %define name smeserver-geneweb
 Name: %{name}
 %define version 2.0 
-%define release 3
+%define release 7
 Version: %{version}
-Release: %smerelease %{release}
-Copyright: GPL
+Release: %{release}%{?dist}
+License: GPL
 Group: Applications/Internet
 Source: %{name}-%{version}.tar.gz
-#Patch0:
-Packager: %{_packager}
+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
 Requires: smeserver-release >= 7.0
+Requires: e-smith-formmagick >= 1.4.0-10
+BuildRequires: e-smith-devtools
 
 %description
 This RPM must be installed after the geneweb*.el4.sme.i386.rpm package
 to complete the integration for SME Server.
 
 %changelog
+* Wed Mar 12 2008 Shad L. Lords <slords@mail.com> - 2.0-7
+- Add requires for e-smith-formmagick for UTF-8 support [SME: 3858]
+
+* 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)
+
 * Thu Apr 12 2007 Craig D. Jensen <craig.d.jensen@gmail.com>
 - [2.0-1] First companion to Geneweb v5 w/panel for admin allowing
   for setting the desired IP on the LAN for Geneweb administrative
@@ -30,7 +45,9 @@ to complete the integration for SME Serv
 rm -rf $RPM_BUILD_ROOT
 
 %setup
-#%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks
@@ -40,6 +57,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)