--- rpms/e-smith-base/sme10/e-smith-base.spec	2016/04/13 15:06:37	1.15
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2016/06/12 06:55:15	1.20
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.14 2016/04/12 07:23:30 unnilennium Exp $
+# $Id: e-smith-base.spec,v 1.19 2016/06/02 15:07:45 vip-ire Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.8.0
-%define release 13
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,8 +16,11 @@ Patch2: e-smith-base-5.8.0-remove_ctrlal
 Patch3: e-smith-base-5.8.0-movese_services_to_systemd.patch
 Patch4: e-smith-base-5.8.0-LOCALE.patch
 Patch5: e-smith-base-5.8.0-install_on_every_reboot.patch
+Patch6: e-smith-base-5.8.0-PasswordSet.patch
+Patch7: e-smith-base-5.8.0-console_wrapper.patch
+Patch8: e-smith-base-5.8.0-postinstall.patch
+Patch9: e-smith-base-5.8.0-fix_forward_field_display.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
 Requires: pwauth
 Requires: e-smith-lib >= 2.2.0-2
 Requires: server-manager-images, server-manager
@@ -44,6 +47,7 @@ Requires: diald
 Requires: /usr/bin/passwd
 Requires: nss-pam-ldapd
 Requires: uuid-perl
+Requires: kbd
 Obsoletes: nss_ldap < 254
 Requires: cpu >= 1.4.3
 Obsoletes: rlinetd, e-smith-mod_ssl
@@ -61,6 +65,22 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sun Jun 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-18.sme
+- fix Lang and keyboard layout configured are not used [SME: 9539]
+
+* Thu Jun 2 2016 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-17.sme
+- Fix display of email forward fields since smtpd entry has been merged
+  qpsmtpd [SME: 9552]
+
+* Sun May 29 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-16.sme
+- Allow bootstrap to start services after post-install configuration [SME: 9530]
+
+* Thu May 12 2016 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-15.sme
+- Use a C wrapper for the console to replace perl-suid [SME: 9393]
+
+* Wed Apr 13 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-14.sme
+- fix password not asked after signal-event post-install [SME: 9445]
+
 * Wed Apr 13 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-13.sme
 - only start services on regular boot  [SME: 9436]
 
@@ -1832,6 +1852,11 @@ e-smith server and gateway software - ba
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \
@@ -1851,11 +1876,13 @@ done
 
 /sbin/e-smith/generate-lexicons
 
-xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console
+xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console.pl
 
 perl createlinks
 /sbin/e-smith/buildtests 10e-smith-base
 
+gcc -o root/sbin/e-smith/console console_wrapper.c
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/selinux