--- rpms/smeserver-support/sme8/smeserver-support.spec 2008/03/18 16:41:04 1.12 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2008/10/07 14:06:43 1.17 @@ -1,13 +1,20 @@ +# $Id: smeserver-support.spec,v 1.16 2008/08/07 14:58:28 slords Exp $ + Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 1.6.0 -%define release 49 +%define release 53 # These packages come from CentOS, but wee need to use care when # updating them - either we've patched them, or we need to do something # prior to taking the update +%if "%{?rhel}" == "5" +# TODO: check mkinitrd,mdadm to see if needed +%define centos_excludes initscripts +%else %define centos_excludes kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,initscripts +%endif Version: %{version} Release: %{release}%{?dist} @@ -33,6 +40,7 @@ Patch13: smeserver-support-1.6.0-smolt.p Patch14: smeserver-support-1.6.0-supportlexicon.patch Patch15: smeserver-support-1.6.0-tags2general.patch Patch16: smeserver-support-1.6.0-gettextNetConnectFail.patch +Patch17: smeserver-support-1.6.0-gettextConsole.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -67,7 +75,6 @@ Obsoletes: pine Obsoletes: system-config-keyboard Obsoletes: system-config-mouse Obsoletes: xorg-x11-Mesa-libGL -Obsoletes: yum-metadata-parser # remove netatalk and modules Obsoletes: e-smith-netatalk @@ -143,6 +150,7 @@ Requires: e-smith-samba # Pull in locales so we have a smooth language upgrade [SF: 1309520] #Requires: smeserver-locale-ca +Requires: smeserver-locale-bg Requires: smeserver-locale-da Requires: smeserver-locale-de Requires: smeserver-locale-el @@ -152,9 +160,11 @@ Requires: smeserver-locale-hu Requires: smeserver-locale-id Requires: smeserver-locale-it Requires: smeserver-locale-nl +Requires: smeserver-locale-pt Requires: smeserver-locale-pt_BR Requires: smeserver-locale-sl Requires: smeserver-locale-sv +Requires: smeserver-locale-tr # These should be re-pulled by other e-smith packages. Obsoletes: perl-File-MMagic = 1.22-1 @@ -274,6 +284,20 @@ Conflicts: dungog-deletedoublebounce Conflicts: dungog-mailblocking %changelog +* Tue Oct 7 2008 Shad L. Lords 1.6.0-53 +- Update excludes for sme8 [SME: 4507] + +* Thu Aug 7 2008 Charlie Brady 1.6.0-52 +- Remove incorrect 'Obsoletes: yum-metadata-parser'. [SME: 4466] + +* Sat Jul 26 2008 Shad L. Lords 1.6.0-51 +- Add support for Bulgarian (bg) [SME: 4337] +- Re-add support for Portuguese (pt) [SME: 4006] +- Add support for Turkish (tr) [SME: 4443] + +* Tue Mar 18 2008 Shad L. Lords 1.6.0-50 +- Add gettext to console titles. + * Tue Mar 18 2008 Shad L. Lords 1.6.0-49 - Fix support for Portuguese (pt_BR) [SME: 4006] @@ -893,6 +917,7 @@ cp %{SOURCE2} root/etc/e-smith/web/commo %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %build perl createlinks