--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/09/23 14:59:41 1.99 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2010/10/11 17:19:05 1.104 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.98 2010/08/08 08:08:32 wellsi Exp $ +# $Id: e-smith-base.spec,v 1.103 2010/10/08 17:01:43 slords Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 29 +%define release 34 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -34,6 +34,11 @@ Patch21: e-smith-base-5.2.0-condrestart. Patch22: e-smith-base-5.2.0-condrestart.patch2 Patch23: e-smith-base-5.2.0-cpuspeed.patch Patch24: e-smith-base-5.2.0-nss_ldap.patch +Patch25: e-smith-base-5.2.0-ibay_groups.patch +Patch26: e-smith-base-5.2.0-keep_external.patch +Patch27: e-smith-base-5.2.0-checkMaxUsers.patch +Patch28: e-smith-base-5.2.0-apmd64bit.patch +Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -80,6 +85,21 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Mon Oct 11 2010 Daniel Berteaud 5.2.0-34.sme +- Relocate dhclient conf file [SME: 5833] + +* Fri Oct 8 2010 Shad L. Lords 5.2.0-33.sme +- Disable apmd on 64-bit arch [SME: 6170] + +* Fri Oct 8 2010 Shad L. Lords 5.2.0-32.sme +- Remove check for maxUsers [SME: 5537] + +* Wed Oct 6 2010 Shad L. Lords 5.2.0-31.sme +- Try and keep same external address for pppoe connections [SME: 6263] + +* Mon Sep 27 2010 Shad L. Lords 5.2.0-30.sme +- Add ibay groups to group membership [SME: 6247] + * Thu Sep 23 2010 Daniel Berteaud 5.2.0-29.sme - Prepare nss_ldap [SME: 6227] @@ -1411,6 +1431,11 @@ e-smith server and gateway software - ba %patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]