--- rpms/e-smith-base/sme9/e-smith-base.spec 2013/05/08 03:12:58 1.33 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2013/06/06 15:35:46 1.37 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.32 2013/05/07 06:22:32 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.36 2013/05/20 15:06:51 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 32 +%define release 35 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -38,6 +38,9 @@ Patch24: e-smith-base-5.4.0-rename_pam_l Patch25: e-smith-base-5.4.0-fix_bash-in_run_pppoe_conf.patch Patch26: e-smith-base-5.4.0-StartService.patch 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -86,6 +89,15 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* 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] + +* Sat May 18 2013 chris burnat 5.4.0-33.sme +- Add_template_to_ssl.pem, codes by JP Pialasse [SME: 7601] + * Tue May 07 2013 Ian Wells 5.4.0-32.sme - Require diald [SME: 7279] @@ -1638,14 +1650,15 @@ e-smith server and gateway software - ba %patch25 -p1 %patch26 -p1 %patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -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 rm -rf root/etc/e-smith/templates/etc/ldap.secret/ %pre -/sbin/e-smith/create-system-user smelog 1002 \ - 'smelog log user' /var/log/smelog /bin/false /sbin/e-smith/create-system-user smelastsys 2999 \ 'sme last system user marker' /tmp /bin/false