--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/10/12 17:55:13 1.107 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/11/03 18:55:06 1.112 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.106 2010/10/11 23:17:01 slords Exp $ +# $Id: e-smith-base.spec,v 1.111 2010/11/03 14:00:42 slords Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 37 +%define release 44 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -42,6 +42,11 @@ Patch29: e-smith-base-5.2.0-relocate_dhc Patch30: e-smith-base-5.2.0-echo-options.patch Patch31: e-smith-base-5.2.0-migrateHWaddr.patch Patch32: e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch +Patch33: e-smith-base-5.2.0-fix_empty_file_test.patch +Patch34: e-smith-base-5.2.0-cpu-conf.patch +Patch35: e-smith-base-5.2.0-ldap-auth.patch +Patch36: e-smith-base-5.2.0-enable-cpu.patch +Patch37: e-smith-base-5.2.0-better-ldap.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -69,6 +74,7 @@ Requires: mdadm Requires: pv Requires: pam_abl Requires: nss_ldap +Requires: cpu >= 1.4.3 Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console Obsoletes: sshell @@ -88,6 +94,28 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Wed Nov 3 2010 Shad L. Lords 5.2.0-38.sme +- Fix empty leases file test [SME: 6274] + * Tue Oct 12 2010 Daniel Berteaud 5.2.0-37.sme - Relocate dhcpd leases file [SME: 6274] @@ -1451,6 +1479,11 @@ e-smith server and gateway software - ba %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]