--- rpms/e-smith-base/sme10/e-smith-base.spec	2016/07/16 14:47:40	1.24
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2017/04/15 04:11:53	1.37
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.23 2016/07/14 21:40:26 stephdl Exp $
+# $Id: e-smith-base.spec,v 1.36 2017/04/12 21:53:32 unnilennium Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.8.0
-%define release 21
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -23,6 +23,17 @@ Patch9: e-smith-base-5.8.0-fix_forward_f
 Patch10: e-smith-base-5.8.0.bz9631.SetHostnameByHostnamectl.patch
 Patch11: e-smith-base-5.8.0.bz9398.DeprecatedRsyslogSyntax.patch
 Patch12: e-smith-base-5.8.0.bz9641.fix-startup-path.patch
+Patch13: e-smith-base-5.8.0-mariadb.patch
+Patch14: e-smith-base-5.8.0.bz9687.local-link.patch
+Patch15: e-smith-base-5.8.0-bz9688.skipredirect.patch
+Patch16: e-smith-base-5.8.0-bz9672.servicesystemd.patch
+Patch17: e-smith-base-5.8.0.bz9724.locale_sysconfig.patch
+Patch18: e-smith-base-5.8.0-allow_32bits_mask.patch
+Patch19: e-smith-base-5.8.0-ip_route_syntax.patch
+Patch20: e-smith-base-5.8.0.bz9550.fixconsolerestore.patch
+Patch21: e-smith-base-5.8.0.bz10121-moretranslationlinks.patch
+Patch22: e-smith-base-5.8.0.bz9478-move-smtpd-to-qpsmtpd.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: pwauth
 Requires: e-smith-lib >= 2.2.0-2
@@ -68,6 +79,41 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sat Apr 15 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-34.sme
+- improve regex to catch local [SME: 9724]
+
+* Wed Apr 12 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-33.sme
+- change smtpd to qpsmtpd for default service access [SME: 9478]
+
+* Mon Feb 27 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-32.sme
+- add translation links for manager to most language variations we support [SME: 11121]
+
+* Fri Feb 17 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-31.sme
+- prevent restoration from being called on regular and post-upgrade reboot [SME: 9550]
+- console restoration can be launched again from console
+
+* Thu Feb 9 2017 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-30.sme
+- Use ip route syntax to define routes to local network [SME: 10083]
+
+* Tue Sep 6 2016 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-29.sme
+- Allow /32 masks on the external interface, in which case we don't
+  check if the gateway is on the correct network) [SME: 9610]
+
+* Thu Aug 04 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-28.sme
+- fix config db locale property [SME: 9724]
+
+* Sat Jul 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-27.sme
+- adapt e-smith service command to systemd [SME: 9672]
+
+* Fri Jul 22 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-26.sme
+- add systemd skip redirect to e-smith-service  [SME: 9688]
+
+* Thu Jul 21 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-25.sme
+- fix broken link /etc/init.d/supervise/local link [SME: 9687]
+
+* Mon Jul 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-22.sme
+- fix mysqld to mariadb  [SME: 9438]
+
 * Sat Jul 16 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-21.sme
 - fix missing path to chkconfig [SME: 9641]
 
@@ -1873,7 +1919,16 @@ e-smith server and gateway software - ba
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1 
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \