--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/01/31 05:14:04 1.83 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/02/14 19:42:41 1.87 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.82 2010/01/30 21:34:04 snetram Exp $ +# $Id: e-smith-base.spec,v 1.86 2010/02/14 10:37:30 snetram Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 12 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -22,6 +22,9 @@ Patch9: e-smith-base-5.2.0-FixLocale_Ext Patch10: e-smith-base-5.2.0-perform_restore-hal.patch Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch Patch12: e-smith-base-5.2.0-perform_backup-hal.patch +Patch13: e-smith-base-5.2.0-hwaddress.patch +Patch14: e-smith-base-5.2.0-sha1.patch +Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -66,6 +69,18 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sun Feb 14 2010 Jonathan Martens 5.2.0-17.sme +- Really fix template expansion error [SME: 4528] + +* Sun Feb 14 2010 Jonathan Martens 5.2.0-16.sme +- Fix template expansion error [SME: 4528] + +* Mon Feb 8 2010 Jonathan Martens 5.2.0-15.sme +- Improve security by using SHA1 algorithm for certificate signing [SME: 5737] + +* Fri Feb 5 2010 Stephen Noble 5.2.0-14.sme +- Fix eth? swapping [SME: 4528] + * Sun Jan 31 2010 Stephen Noble 5.2.0-13.sme - Fix console backup from removable media [SME: 4809] @@ -1336,6 +1351,9 @@ e-smith server and gateway software - ba %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]