--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/10/11 21:56:51 1.105 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/11/04 20:02:03 1.113 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.104 2010/10/11 17:19:05 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.112 2010/11/03 18:55:06 slords Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 35 +%define release 45 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -40,6 +40,14 @@ Patch27: e-smith-base-5.2.0-checkMaxUser Patch28: e-smith-base-5.2.0-apmd64bit.patch Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch 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 +Patch38: e-smith-base-5.2.0-add-extra-ldap.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -67,6 +75,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 @@ -86,6 +95,37 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Thu Nov 4 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] + +* Mon Oct 11 2010 Shad L. Lords 5.2.0-36.sme +- Add migrate script to add missing HWaddr to interface records [SME: 6267] + * Mon Oct 11 2010 Shad L. Lords 5.2.0-35.sme - Make lcp options configurable [SME: 6277] @@ -1441,6 +1481,14 @@ e-smith server and gateway software - ba %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]