--- rpms/e-smith-base/sme8/e-smith-base.spec 2008/09/20 14:39:23 1.66 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2008/10/13 21:47:35 1.70 @@ -1,18 +1,19 @@ +# $Id: e-smith-base.spec,v 1.69 2008/10/07 17:52:47 slords Exp $ + Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} -%define version 4.19.0 -%define release 5 +%define version 5.2.0 +%define release 2 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch1: e-smith-base-4.19.0-xenfix.patch -Patch2: e-smith-base-4.19.0-profile.patch +Patch1: e-smith-base-5.2.0-sambaRole.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external -Requires: e-smith-lib >= 1.18.0-19 +Requires: e-smith-lib >= 2.2.0-2 Requires: server-manager-images, server-manager Requires: e-smith-formmagick >= 1.4.0-12 Requires: initscripts >= 6.67-1es17 @@ -39,9 +40,7 @@ Obsoletes: rlinetd, e-smith-mod_ssl Obsoletes: e-smith-serial-console Obsoletes: sshell Obsoletes: e-smith-rp-pppoe -%if "%{?rhel}" == "5" Obsoletes: perl-Data-UUID -%endif BuildRequires: perl, perl(Test::Inline) >= 0.12 BuildRequires: e-smith-devtools >= 1.13.1-03 BuildRequires: gettext @@ -56,6 +55,15 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Mon Oct 13 2008 Shad L. Lords 5.2.0-2.sme +- Add patch to support multiple samba roles [SME: 4172] + +* Tue Oct 7 2008 Shad L. Lords 5.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Tue Sep 23 2008 Stephen Noble 4.19.0-6 +- Add locale tags for email in review panel [SME: 4267] + * Sat Sep 20 2008 Shad L. Lords 4.19.0-5 - Correct gettext type during build process [SME: 570] @@ -1273,7 +1281,6 @@ e-smith server and gateway software - ba %prep %setup %patch1 -p1 -%patch2 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]