--- rpms/smeserver-sme9admin/contribs9/smeserver-sme9admin.spec	2016/12/15 18:35:44	1.6
+++ rpms/smeserver-sme9admin/contribs9/smeserver-sme9admin.spec	2016/12/20 05:42:40	1.9
@@ -1,4 +1,4 @@
-# $Id: smeserver-sme9admin.spec,v 1.5 2016/11/23 23:36:51 unnilennium Exp $
+# $Id: smeserver-sme9admin.spec,v 1.8 2016/12/18 04:02:27 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 19
+%define release 22
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,6 +16,9 @@ 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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -35,6 +38,16 @@ Obsoletes: smeserver-sme8admin
 AutoReqProv: no
 
 %changelog
+* 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
@@ -118,6 +131,9 @@ This contrib is a bit inspired by e-smit
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -135,7 +151,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