--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/03/01 19:02:20 1.88 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/06/08 19:43:47 1.93 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.87 2010/02/14 19:42:41 snetram Exp $ +# $Id: e-smith-base.spec,v 1.92 2010/06/06 07:34:55 snetram Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 18 +%define release 23 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -26,6 +26,10 @@ Patch13: e-smith-base-5.2.0-hwaddress.pa Patch14: e-smith-base-5.2.0-sha1.patch Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch Patch16: e-smith-base-5.2.0-gettext.patch +Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch +Patch18: e-smith-base-5.2.0-checkMaxUsers.patch +Patch19: e-smith-base-5.2.0-no-nic.patch +Patch20: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -41,6 +45,7 @@ Requires: perl(Net::IPv4Addr) Requires: /usr/sbin/irqbalance Requires: /usr/sbin/cpuspeed Requires: /sbin/microcode_ctl +Requires: /usr/sbin/smartd Requires: dbus Requires: hal Requires: acpid @@ -70,6 +75,21 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Tue Jun 8 2010 Jonathan Martens 5.2.0-23.sme +- Fix translation of local nic string in console [SME: 5571] + +* Sun Jun 6 2010 Jonathan Martens 5.2.0-22.sme +- Handle no network interface scenario in console [SME: 6023] + +* Sat Jun 5 2010 Ian Wells 5.2.0-21.sme +- Remove checkMaxUsers(). [SME: 5537] + +* Mon May 10 2010 John H. Bennett III 5.2.0-20.sme +- Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941] + +* Wed Mar 3 2010 Federico Simoncelli 5.2.0-19.sme +- Restate smartd dependency. [SME: 5814] + * Mon Mar 1 2010 Shad L. Lords 5.2.0-18.sme - Fix gettext errors in WAN/LAN subnet error message [SME: 5501] @@ -1359,6 +1379,10 @@ e-smith server and gateway software - ba %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]