--- rpms/e-smith-base/sme9/e-smith-base.spec 2013/03/22 16:47:56 1.27 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2013/05/07 06:22:32 1.32 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.26 2013/03/17 05:15:13 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.31 2013/05/05 16:38:15 wellsi Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.4.0 -%define release 26 +%define release 31 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -35,6 +35,9 @@ Patch21: e-smith-base-5.4.0-more_rsyslog Patch22: e-smith-base-5.4.0-ConsoleBackupText.patch Patch23: e-smith-base-5.4.0-NICBonding.patch Patch24: e-smith-base-5.4.0-rename_pam_ldap_conf.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -82,6 +85,21 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Mon May 06 2013 Ian Wells 5.4.0-31.sme +- Removal of rc.e-smith now functionality is in e-smith-service [SME: 7267] + +* Sun May 05 2013 Ian Wells 5.4.0-30.sme +- Revert last change. [SME: 7227] + +* Sat May 04 2013 Ian Wells 5.4.0-29.sme +- Suppress template text from /etc/inittab [SME: 7227] + +* Mon Apr 22 2013 Ian Wells 5.4.0-28.sme +- Replacement of rc.e-smith by moving code into e-smith-service [SME: 7267] + +* Mon Apr 21 2013 chris burnat 5.4.0-27.sme +- Fix the way '.' works in bash [SME: 7532] + * Fri Mar 22 2013 Daniel Berteaud 5.4.0-26.sme - rename /etc/ldap.conf to /etc/pam_ldap.conf (and same for .secret) [SME: 7289] @@ -1613,6 +1631,9 @@ e-smith server and gateway software - ba %patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -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