--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/10/14 16:21:30 1.108 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/11/08 03:58:38 1.119 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.107 2010/10/12 17:55:13 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.118 2010/11/06 06:12:31 slords Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 38 +%define release 51 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -43,6 +43,13 @@ Patch30: e-smith-base-5.2.0-echo-options 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 +Patch38: e-smith-base-5.2.0-add-extra-ldap.patch +Patch39: e-smith-base-5.2.0-cpu-can-delete.patch +Patch40: e-smith-base-5.2.0-supp-groups.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -70,6 +77,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 @@ -89,6 +97,46 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sun Nov 7 2010 Shad L. Lords 5.2.0-38.sme - Fix empty leases file test [SME: 6274] @@ -1456,6 +1504,13 @@ e-smith server and gateway software - ba %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]