--- rpms/smeserver-sme9admin/contribs9/smeserver-sme9admin.spec	2015/06/15 22:29:40	1.1
+++ rpms/smeserver-sme9admin/contribs9/smeserver-sme9admin.spec	2017/01/02 01:17:42	1.10
@@ -1,4 +1,4 @@
-# $Id: smeserver-sme9admin.spec,v 1.4 2013/12/30 06:47:01 unnilennium Exp $
+# $Id: smeserver-sme9admin.spec,v 1.9 2016/12/20 05:42:40 unnilennium Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 # 
@@ -7,12 +7,19 @@ Summary: A graphical monitor, alert rais
 %define name smeserver-sme9admin
 Name: %{name}
 %define version 1.5
-%define release 15
+%define release 23
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 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
+Patch4: smeserver-sme9admin-1.5-bz9894-utf8.patch
+Patch5: smeserver-sme9admin-1.5-locale-2016-12-20.patch
+Patch6: smeserver-sme9admin-1.5-bz9886-bz9889-warnings.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -32,8 +39,36 @@ Obsoletes: smeserver-sme8admin
 AutoReqProv: no
 
 %changelog
-* Tue Jun 16 2015 stephane de labrusse <stephdl@de-labrusse.fr> 1.5-15.sme
-- first commit to smecontribs
+* Sun Jan 01 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.5-23.sme
+- fix warning related to raid detection code [SME: 9886]
+- fix warning related to non existing services removed sinces previous versions [SME: 9889]
+
+* Tue Dec 20 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.5-22.sme
+- make CGI and pictures utf8 compliant [SME: 9894]
+- apply smeserver-sme9admin-1.5-locale-2016-12-20.patch
+
+* 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]
+
+* Wed Nov 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.5-16.sme
+- add more verbose email alert [SME: 9725]
+
+* Fri Aug 21 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5-15.sme
+- Initial release to contribs9
 
 * Wed Dec 24 2014 stephane de labrusse <stephdl@de-labrusse.fr> 1.5-14.sme
 - changed  $mypid = `cat $mypid` by open(FIC,"<$mypid") [SME:8740]
@@ -98,6 +133,13 @@ This contrib is a bit inspired by e-smit
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
@@ -115,7 +157,10 @@ xgettext --from-code UTF-8 -F --no-wrap
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+|grep -v '/etc/e-smith/sql/init/sme9admin'\
+|grep -v '/usr/bin/sme9admind'\
+|grep -v '/usr/share/doc/smeserver-sme9admin/add_ds_to_rrd.pl'> %{name}-%{version}-filelist
 
 %clean 
 rm -rf $RPM_BUILD_ROOT