--- rpms/smeserver-mailsorting/contribs8/smeserver-mailsorting.spec	2013/11/29 21:35:17	1.5
+++ rpms/smeserver-mailsorting/contribs8/smeserver-mailsorting.spec	2016/03/09 07:15:47	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailsorting.spec,v 1.4 2013/11/28 05:42:37 unnilennium Exp $
+# $Id: smeserver-mailsorting.spec,v 1.7 2013/12/11 21:01:28 unnilennium Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
@@ -6,7 +6,7 @@ Summary: Lets users configure procmail o
 %define name smeserver-mailsorting
 Name: %{name}
 %define version 1.2
-%define release 44
+%define release 46
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -49,6 +49,9 @@ Patch32: smeserver-mailsorting-forward.p
 Patch33: smeserver-mailsorting-1.2-RemoveTO_space.patch
 Patch34: smeserver-mailsorting-1.2-admin-account.patch
 Patch35: smeserver-mailsorting-1.2-geekmode2.patch
+Patch36: smeserver-mailsorting-1.2-admin-account2.patch
+Patch37: smeserver-mailsorting-1.2-locale-2016-03-09.patch
+
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires:  e-smith-release >= 7.0,
@@ -63,6 +66,12 @@ SME Server enhancement to enable procmai
 Optionally provides user panels where users can create mail rules for themselves
 
 %changelog
+* Wed Mar 09 2016 JP Pialasse <tests@pialasse.com> 1.2-46.sme
+- apply locale 2016-03-09 patch
+
+* Wed Dec 11 2013 JP Pialasse <tests@pialasse.com> 1.2-45.sme
+- fix bug as admin .procmail was not created [SME: 8023]
+
 * Fri Nov 29 2013 JP Pialasse <tests@pialasse.com> 1.2-44.sme
 - fix admin patch 
 
@@ -285,6 +294,8 @@ Optionally provides user panels where us
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
+%patch37 -p1
 
 
 %build
@@ -304,8 +315,6 @@ rm -f %{name}-%{version}-filelist
 echo "%doc COPYING"  >> %{name}-%{version}-filelist
 
 %clean
-cd ..
-rm -rf %{name}-%{version}
 
 %pre
 %preun
@@ -323,6 +332,7 @@ fi
 
 #upgrades (and new installs)
 /bin/touch /home/e-smith/db/processmail
+# this one is essential to avoid to lose mails !!!!
 /sbin/e-smith/signal-event mailsorting-conf
 if [ -d /etc/e-smith/events/conf-userpanel ] ; then
    /sbin/e-smith/signal-event conf-userpanel