--- rpms/smeserver-locale/sme9/smeserver-locale.spec	2013/01/31 21:35:09	1.1
+++ rpms/smeserver-locale/sme9/smeserver-locale.spec	2013/09/14 18:58:43	1.5
@@ -1,10 +1,10 @@
-# $Id: smeserver-locale.spec,v 1.98 2012/03/20 15:36:32 slords Exp $
+# $Id: smeserver-locale.spec,v 1.4 2013/03/11 21:06:50 slords Exp $
 
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
 %define version 2.4.0
-%define release 1
+%define release 5
 %define package_summary SME Server localisation module
 %define group Applications/System
 %define package_locales bg da de el es et fr he hu id it ja nb nl pl pt pt_BR ro ru sl sv th tr zh_CN zh_TW
@@ -13,6 +13,7 @@ Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch1: smeserver-locale-2.4.0-locale-2013-09-14.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -24,6 +25,15 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* Sat Sep 14 2013 Ian Wells <esmith@wellsi.com> 2.4.0-5.el6
+- apply locale 2013-09-14 patch from pootle [SME: 7848]
+
+* Mon Mar 11 2013 Shad L. Lords <slords@mail.com> 2.4.0-4.el6
+- Obsolete el5 version of aspell module [SME: 7273]
+
+* Thu Jan 31 2013 Shad L. Lords <slords@mail.com> 2.4.0-2.el6
+- Replace aspell dictionaries with hunspell dictionaries
+
 * Thu Jan 31 2013 Shad L. Lords <slords@mail.com> 2.4.0-1.el6
 - Roll new stream for sme9
 
@@ -500,6 +510,7 @@ SME Server localisation module
 
 %prep
 %setup
+%patch1 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)
@@ -537,7 +548,8 @@ rm -rf $RPM_BUILD_ROOT
 %package bg
 Summary: %{package_summary} - Bulgarian
 Group: %{group}
-Requires: aspell-bg
+Requires: hunspell-bg
+Obsoletes: aspell-bg <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description bg
 %{summary}
@@ -546,7 +558,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package da
 Summary: %{package_summary} - Danish
 Group: %{group}
-Requires: aspell-da
+Requires: hunspell-da
+Obsoletes: aspell-da <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description da
 %{summary}
@@ -555,7 +568,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package de
 Summary: %{package_summary} - German
 Group: %{group}
-Requires: aspell-de
+Requires: hunspell-de
+Obsoletes: aspell-de <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description de
 %{summary}
@@ -564,7 +578,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package el
 Summary: %{package_summary} - Greek
 Group: %{group}
-Requires: aspell-el
+Requires: hunspell-el
+Obsoletes: aspell-el <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description el
 %{summary}
@@ -573,7 +588,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package es
 Summary: %{package_summary} - Spanish
 Group: %{group}
-Requires: aspell-es
+Requires: hunspell-es
+Obsoletes: aspell-es <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description es
 %{summary}
@@ -582,6 +598,7 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package et
 Summary: %{package_summary} - Estonian
 Group: %{group}
+Requires: hunspell-et
 Requires: e-smith-formmagick >= 1.4.0-10
 %description et
 %{summary}
@@ -590,7 +607,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package fr
 Summary: %{package_summary} - French
 Group: %{group}
-Requires: aspell-fr
+Requires: hunspell-fr
+Obsoletes: aspell-fr <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description fr
 %{summary}
@@ -599,6 +617,7 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package he
 Summary: %{package_summary} - Hebrew
 Group: %{group}
+Requires: hunspell-he
 Requires: e-smith-formmagick >= 1.4.0-10
 %description he
 %{summary}
@@ -607,6 +626,7 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package hu
 Summary: %{package_summary} - Hungarian
 Group: %{group}
+Requires: hunspell-hu
 Requires: e-smith-formmagick >= 1.4.0-10
 %description hu
 %{summary}
@@ -615,7 +635,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package id
 Summary: %{package_summary} - Indonesian
 Group: %{group}
-Requires: aspell-id
+Requires: hunspell-id
+Obsoletes: aspell-id <= 50:0.50.1
 Requires: e-smith-formmagick >= 1.4.0-10
 %description id
 %{summary}
@@ -624,7 +645,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package it
 Summary: %{package_summary} - Italian
 Group: %{group}
-Requires: aspell-it
+Requires: hunspell-it
+Obsoletes: aspell-it <= 50:0.53
 Requires: e-smith-formmagick >= 1.4.0-10
 %description it
 %{summary}
@@ -641,6 +663,7 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package nb
 Summary: %{package_summary} - Norwegian (Bokmal)
 Group: %{group}
+Requires: hunspell-nb
 Requires: e-smith-formmagick >= 1.4.0-10
 %description nb
 %{summary}
@@ -649,7 +672,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package nl
 Summary: %{package_summary} - Dutch
 Group: %{group}
-Requires: aspell-nl
+Requires: hunspell-nl
+Obsoletes: aspell-nl <= 51:0.1e
 Requires: e-smith-formmagick >= 1.4.0-10
 %description nl
 %{summary}
@@ -658,7 +682,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package pl
 Summary: %{package_summary} - Polish
 Group: %{group}
-Requires: aspell-pl
+Requires: hunspell-pl
+Obsoletes: aspell-pl <= 50:0.51
 Requires: e-smith-formmagick >= 1.4.0-10
 %description pl
 %{summary}
@@ -667,7 +692,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package pt
 Summary: %{package_summary} - Portugese
 Group: %{group}
-Requires: aspell-pt
+Requires: hunspell-pt
+Obsoletes: aspell-pt <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description pt
 %{summary}
@@ -676,7 +702,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package pt_BR
 Summary: %{package_summary} - Portugese (Brazilian)
 Group: %{group}
-Requires: aspell-pt
+Requires: hunspell-pt
+Obsoletes: aspell-pt <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description pt_BR
 %{summary}
@@ -685,6 +712,7 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package ro
 Summary: %{package_summary} - Romanian
 Group: %{group}
+Requires: hunspell-ro
 Requires: e-smith-formmagick >= 1.4.0-10
 %description ro
 %{summary}
@@ -693,7 +721,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package ru
 Summary: %{package_summary} - Russian
 Group: %{group}
-Requires: aspell-ru
+Requires: hunspell-ru
+Obsoletes: aspell-ru <= 50:0.99f7
 Requires: e-smith-formmagick >= 1.4.0-10
 %description ru
 %{summary}
@@ -702,7 +731,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package sl
 Summary: %{package_summary} - Slovinian
 Group: %{group}
-Requires: aspell-sl
+Requires: hunspell-sl
+Obsoletes: aspell-sl <= 50:0.50
 Requires: e-smith-formmagick >= 1.4.0-10
 %description sl
 %{summary}
@@ -711,7 +741,8 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package sv
 Summary: %{package_summary} - Swedish
 Group: %{group}
-Requires: aspell-sv
+Requires: hunspell-sv
+Obsoletes: aspell-sv <= 50:0.51
 Requires: e-smith-formmagick >= 1.4.0-10
 %description sv
 %{summary}
@@ -720,6 +751,7 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package th
 Summary: %{package_summary} - Thai
 Group: %{group}
+Requires: hunspell-th
 Requires: e-smith-formmagick >= 1.4.0-10
 %description th
 %{summary}