--- rpms/e-smith-base/sme7/e-smith-base.spec 2010/06/08 20:57:42 1.78 +++ rpms/e-smith-base/sme7/e-smith-base.spec 2012/06/30 17:06:00 1.83 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.77 2010/06/02 19:04:21 slords Exp $ +# $Id: e-smith-base.spec,v 1.82 2010/09/27 20:35:43 slords Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.0.0 -%define release 12 +%define release 16 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -21,6 +21,9 @@ Patch8: e-smith-base+ldap-5.0.0-generate Patch9: e-smith-base-5.0.0-sha1.patch Patch10: e-smith-base-5.0.0-badkmods.patch Patch11: e-smith-base-5.0.0-fix-local-nic-string-in-console.patch +Patch12: e-smith-base-5.0.0-condrestart.patch +Patch13: e-smith-base-5.0.0-ibay_groups.patch +Patch14: e-smith-base-5.0.0-keep_external.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.0.0-2 @@ -64,7 +67,20 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Tue Jun 8 2010 Jonathan Martens 5.0.0-12.sme +* Sat Jun 30 2012 Ian Wells 5.0.0-16.sme +- Try and keep same external address for pppoe connections [SME: 6262] + +* Mon Sep 27 2010 Shad L. Lords 5.0.0-15.sme +- Add ibay groups to group membership [SME: 6248] + +* Mon Jul 19 2010 Charlie Brady 5.0.0-14.sme +- Don't exit 99 from e-smith-service script when called with 'condrestart' + and service is disabled. [SME: 6104] + +* Wed Jun 09 2010 Shad L. Lords 5.0.0-13.sme +- Fix patch so it doesn't create orig file [SME: 6039] + +* Tue Jun 08 2010 Jonathan Martens 5.0.0-12.sme - Fix translation of local nic string in console [SME: 6039] * Wed Jun 02 2010 Shad L. Lords 5.0.0-11.sme @@ -1327,6 +1343,9 @@ e-smith server and gateway software - ba %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]