--- rpms/e-smith-base/sme9/e-smith-base.spec 2013/05/20 15:06:51 1.36 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2013/06/07 16:33:57 1.38 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.35 2013/05/19 16:01:25 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.37 2013/06/06 15:35:46 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 34 +%define release 36 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -40,6 +40,8 @@ Patch26: e-smith-base-5.4.0-StartService Patch27: e-smith-base-5.4.0-rcesmith-removal.patch Patch28: e-smith-base-5.4.0-add_template_to_ssl.pem.patch Patch29: e-smith-base-5.4.0-init-accounts.patch +Patch30: e-smith-base-5.4.0-do_not_remove_utf8.patch +Patch31: e-smith-base-5.4.0-dont_escape_control_char.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -88,6 +90,12 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Jun 7 2013 Daniel Berteaud 5.4.0-36.sme +- Don't escape control characters in rsyslog [SME: 7662] + +* Thu Jun 6 2013 Daniel Berteaud 5.4.0-35.sme +- Use UTF-8 in the console [SME: 7591] + * Sun May 19 2013 Ian Wells 5.4.0-34.sme - Remove redundant parts of init-accounts [SME: 3550] @@ -1648,6 +1656,8 @@ e-smith server and gateway software - ba %patch27 -p1 %patch28 -p1 %patch29 -p1 +%patch30 -p1 +%patch31 -p1 # We cannot remove an empy files or folders with a patch, see [SME: 7289] # We remove this because it contains an empty template-begin file