--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/07/20 00:20:46 1.96 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/08/08 08:08:32 1.98 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.95 2010/06/11 13:21:14 filippocarletti Exp $ +# $Id: e-smith-base.spec,v 1.97 2010/07/25 13:42:18 charliebrady Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 26 +%define release 28 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -31,6 +31,8 @@ Patch18: e-smith-base-5.2.0-no-nic.patch Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch Patch21: e-smith-base-5.2.0-condrestart.patch +Patch22: e-smith-base-5.2.0-condrestart.patch2 +Patch23: e-smith-base-5.2.0-cpuspeed.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -76,6 +78,12 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sun Aug 8 2010 Ian Wells 5.2.0-28.sme +- Enable cpuspeed by default [SME: 6066] + +* Sun Jul 25 2010 Charlie Brady 5.2.0-27.sme +- Fix syntax error in last patch. [SME: 5830] + * Mon Jul 19 2010 Charlie Brady 5.2.0-26.sme - Don't exit 99 from e-smith-service script when called with 'condrestart' and service is disabled. [SME: 5830] @@ -1395,6 +1403,8 @@ e-smith server and gateway software - ba %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 +%patch23 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]