--- rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/03/07 21:32:12	1.21
+++ rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/03/11 14:14:27	1.24
@@ -2,7 +2,7 @@ Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
 %define version 1.4.0
-%define release 1
+%define release 4
 %define package_summary SME Server localisation module
 %define group Applications/System
 %define package_locales da de el es fr hu id it nl pt sl sv
@@ -11,6 +11,7 @@ Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch1: smeserver-locale-UTF8.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -22,6 +23,16 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* Tue Mar 11 2008 Shad L. Lords <slords@mail.com> 1.4.0-4
+- Move requires e-smith-formmagick to correct places [SME: 3858]
+- Add missing aspell module requires
+
+* Mon Mar 10 2008 Shad L. Lords <slords@mail.com> 1.4.0-3
+- Fix requires to require e-smith-formmagick [SME: 3858]
+
+* Mon Mar 10 2008 Shad L. Lords <slords@mail.com> 1.4.0-2
+- Convert panels to UTF-8 [SME: 3858]
+
 * Fri Mar 7 2008 Shad L. Lords <slords@mail.com> 1.4.0-1
 - Roll new stream and considate patches
 
@@ -297,6 +308,7 @@ SME Server localisation module
 
 %prep
 %setup
+%patch1 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)
@@ -334,6 +346,8 @@ rm -rf $RPM_BUILD_ROOT
 %package da
 Summary: %{package_summary} - Danish
 Group: %{group}
+Requires: aspell-da
+Requires: e-smith-formmagick >= 1.4.0-10
 %description da
 %{summary}
 %files da -f %{name}-%{version}-%{release}-filelist-da
@@ -342,6 +356,7 @@ Group: %{group}
 Summary: %{package_summary} - German
 Group: %{group}
 Requires: aspell-de
+Requires: e-smith-formmagick >= 1.4.0-10
 %description de
 %{summary}
 %files de -f %{name}-%{version}-%{release}-filelist-de
@@ -349,6 +364,8 @@ Requires: aspell-de
 %package el
 Summary: %{package_summary} - Greek
 Group: %{group}
+Requires: aspell-el
+Requires: e-smith-formmagick >= 1.4.0-10
 %description el
 %{summary}
 %files el -f %{name}-%{version}-%{release}-filelist-el
@@ -357,6 +374,7 @@ Group: %{group}
 Summary: %{package_summary} - Spanish
 Group: %{group}
 Requires: aspell-es
+Requires: e-smith-formmagick >= 1.4.0-10
 %description es
 %{summary}
 %files es -f %{name}-%{version}-%{release}-filelist-es
@@ -365,6 +383,7 @@ Requires: aspell-es
 Summary: %{package_summary} - French
 Group: %{group}
 Requires: aspell-fr
+Requires: e-smith-formmagick >= 1.4.0-10
 %description fr
 %{summary}
 %files fr -f %{name}-%{version}-%{release}-filelist-fr
@@ -372,6 +391,7 @@ Requires: aspell-fr
 %package hu
 Summary: %{package_summary} - Hungarian
 Group: %{group}
+Requires: e-smith-formmagick >= 1.4.0-10
 %description hu
 %{summary}
 %files hu -f %{name}-%{version}-%{release}-filelist-hu
@@ -379,6 +399,8 @@ Group: %{group}
 %package id
 Summary: %{package_summary} - Indonesian
 Group: %{group}
+Requires: aspell-id
+Requires: e-smith-formmagick >= 1.4.0-10
 %description id
 %{summary}
 %files id -f %{name}-%{version}-%{release}-filelist-id
@@ -387,6 +409,7 @@ Group: %{group}
 Summary: %{package_summary} - Italian
 Group: %{group}
 Requires: aspell-it
+Requires: e-smith-formmagick >= 1.4.0-10
 %description it
 %{summary}
 %files it -f %{name}-%{version}-%{release}-filelist-it
@@ -394,6 +417,8 @@ Requires: aspell-it
 %package nl
 Summary: %{package_summary} - Dutch
 Group: %{group}
+Requires: aspell-nl
+Requires: e-smith-formmagick >= 1.4.0-10
 %description nl
 %{summary}
 %files nl -f %{name}-%{version}-%{release}-filelist-nl
@@ -401,6 +426,8 @@ Group: %{group}
 %package pt
 Summary: %{package_summary} - Portugese
 Group: %{group}
+Requires: aspell-pt
+Requires: e-smith-formmagick >= 1.4.0-10
 %description pt
 %{summary}
 %files pt -f %{name}-%{version}-%{release}-filelist-pt
@@ -408,6 +435,8 @@ Group: %{group}
 %package sl
 Summary: %{package_summary} - Slovinian
 Group: %{group}
+Requires: aspell-sl
+Requires: e-smith-formmagick >= 1.4.0-10
 %description sl
 %{summary}
 %files sl -f %{name}-%{version}-%{release}-filelist-sl
@@ -416,6 +445,7 @@ Group: %{group}
 Summary: %{package_summary} - Swedish
 Group: %{group}
 Requires: aspell-sv
+Requires: e-smith-formmagick >= 1.4.0-10
 %description sv
 %{summary}
 %files sv -f %{name}-%{version}-%{release}-filelist-sv