--- rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2007/12/25 08:38:22	1.7
+++ rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2008/07/01 20:05:58	1.23
@@ -1,8 +1,12 @@
+# $Id: smeserver-mailsorting.spec,v 1.22 2008/05/22 21:00:47 snetram Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 Summary: Lets users configure procmail or maildrop rules.
 %define name smeserver-mailsorting
 Name: %{name}
 %define version 1.2
-%define release 10
+%define release 22
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,10 +16,21 @@ Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-mailsorting-1.2-maildropdups.patch
 Patch1: smeserver-mailsorting-1.2-esLocale.patch
 Patch2: smeserver-mailsorting-1.2-frLocale3.patch
+Patch3: smeserver-mailsorting-1.2-pootle.patch
+Patch4: smeserver-mailsorting-1.2-locale-2008-03-11.patch
+Patch5: smeserver-mailsorting-1.2-locale-2008-03-14.patch
+Patch6: smeserver-mailsorting-1.2-geekmode.patch
+Patch7: smeserver-mailsorting-1.2-locale-2008-04-01.patch
+Patch8: smeserver-mailsorting-1.2-locale-2008-04-22.patch
+Patch9: smeserver-mailsorting-1.2-add2general.patch
+Patch10: smeserver-mailsorting-1.2-locale-2008-05-05.patch
+Patch11: smeserver-mailsorting-1.2-locale-2008-05-21.patch
+Patch12: smeserver-mailsorting-1.2-locale-2008-07-01.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires:  e-smith-release >= 7.0,
 Requires: perl-Unicode-IMAPUtf7
+Requires: e-smith-formmagick >= 1.4.0-12
 #Requires:  smeserver-userpanel, userpanel causes endless problems
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
@@ -25,6 +40,43 @@ SME Server enhancement to enable procmai
 Optionally provides user panels where users can create mail rules for themselves
 
 %changelog
+* Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-22
+- Apply 1 July 2008 locale patch
+
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-21
+- Apply 21 May 2008 locale patch
+- Updating the release number (it was lagging behind about 10)
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-20
+- Apply 5 May 2008 locale patch
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-19
+- Add common <base> tags to e-smith-formmagick's general
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-18
+- Added 22 April 2008 locale patch
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 1.2-17
+- Update to UTF-8 translations
+
+* Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.2-16
+- block generation of procmail/maildrop rules [SME: 4051]
+
+* Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.2-15
+- update locale 2008-03-14
+
+* Wed Mar 12 2008 Shad L. Lords <slords@mail.com> - 1.2-14
+- Add requires for e-smith-formmagick for UTF-8 support [SME: 3858]
+
+* Tue Mar 11 2008 Stephen Noble <support@dungog.net> - 1.2-13
+- Add 2008-03-11 locale patch
+
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> - 1.2-12
+- prepare en lexicons for pootle translations
+
+* Tue Dec 25 2007 Stephen Noble <support@dungog.net> 1.2-11
+- french translation fix
+
 * Tue Dec 25 2007 Stephen Noble <support@dungog.net> 1.2-10
 - add french translation, thanks Sylvain Gomez
 
@@ -108,10 +160,26 @@ Optionally provides user panels where us
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 perl createlinks
 
+LEXICONS=$(find root/etc/e-smith/{locale/,web/functions/} -type f )
+for lexicon in $LEXICONS
+do
+    /sbin/e-smith/validate-lexicon $lexicon
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
@@ -129,24 +197,16 @@ rm -rf %{name}-%{version}
 %post
 #new installs
 if [ $1 = 1 ] ; then
-
- /etc/e-smith/events/actions/navigation-conf 2>/dev/null
-
- echo ' '
- echo 'to enable procmail or maildrop for all users'
- echo 'for Procmail'
- echo "config setprop qmail FilterType procmail"
- echo 'or for maildrop'
- echo "config setprop qmail FilterType maildrop"
- echo 'then'
- echo 'signal-event mailsorting-conf'
  echo ' '
+ echo 'http://www.dungog.net/wiki/Smeserver-mailsorting#Configuration'
 fi
 
 #upgrades (and new installs)
 /bin/touch /home/e-smith/db/processmail
 /sbin/e-smith/signal-event mailsorting-conf
-/sbin/e-smith/signal-event conf-userpanel
+if [ -d /etc/e-smith/events/conf-userpanel ] ; then
+   /sbin/e-smith/signal-event conf-userpanel
+fi
 
 %postun
 #uninstall