--- rpms/smeserver-sme9admin/contribs9/smeserver-sme9admin.spec	2016/11/23 23:36:51	1.5
+++ rpms/smeserver-sme9admin/contribs9/smeserver-sme9admin.spec	2016/12/18 04:02:27	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-sme9admin.spec,v 1.4 2016/11/23 22:09:37 unnilennium Exp $
+# $Id: smeserver-sme9admin.spec,v 1.7 2016/12/17 15:49:43 unnilennium Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 # 
@@ -7,7 +7,7 @@ Summary: A graphical monitor, alert rais
 %define name smeserver-sme9admin
 Name: %{name}
 %define version 1.5
-%define release 18
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,8 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-sme9admin-1.5-bz9725-email.patch
 Patch1: smeserver-sme9admin-1.5-bz8399-traffic.patch
+Patch2: smeserver-sme9admin-1.5-bz8818-email_accounting.patch
+Patch3: smeserver-sme9admin-1.5-locale-2016-12-18.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -34,6 +36,20 @@ Obsoletes: smeserver-sme8admin
 AutoReqProv: no
 
 %changelog
+* Sat Dec 17 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.5-21.sme
+- locals smeserver-sme9admin-1.5-locale-2016-12-18.patch
+
+* Sat Dec 17 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.5-20.sme
+- fix last patch by adding path to called programs
+
+* Thu Dec 15 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.5-19.sme
+- fix bad accounting for incoming and outgoing mail [SME: 8818]
+- mail_in alert now account for all queued emails from qpsmtpd and sqpsmtpd
+- mail_out alert now account for qmail total remote delivery attempts
+- known issue : on first run will account more than 5 minutes ( whole log) and will alert for exceeding amount
+- added accounting of qpsmtpd and sqpsmtpd code
+- TODO: alert on qmail queue too high, alert on too many qpsmtpd connections
+
 * Wed Nov 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.5-18.sme
 - fix limited size in mysql fields for traffic accounting [SME: 8399]
 
@@ -108,6 +124,8 @@ This contrib is a bit inspired by e-smit
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks