--- rpms/smeserver-support/sme8/smeserver-support.spec 2009/10/27 18:14:57 1.29 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2010/05/17 19:15:50 1.32 @@ -1,12 +1,12 @@ -# $Id: smeserver-support.spec,v 1.28 2009/10/26 22:22:07 slords Exp $ +# $Id: smeserver-support.spec,v 1.31 2010/05/17 18:45:54 snetram Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.2.0 -%define release 10 +%define release 13 -# These packages come from CentOS, but wee need to use care when +# 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 @@ -20,6 +20,7 @@ Group: Networking/Daemons Source: %{name}-%{version}.tar.gz Source1: smeserver_logo.jpg Source2: smeserver_logo.gif +Patch0: smeserver-support.bug5656.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -250,6 +251,15 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Mon May 17 2010 Jonathan Martens 2.2.0-13.sme +- Reverting previous change [SME: 5962] + +* Mon May 17 2010 Jonathan Martens 2.2.0-12.sme +- Migrate CentOS Exclude property default values to smeserver-yum [SME: 5962] + +* Wed Dec 9 2009 Charlie Brady 2.2.0-11.sme +- Fix css validation errors. [SME: 5656] + * Tue Oct 27 2009 Shad L. Lords 2.2.0-10.sme - Add support for Polish (pl). [SME: 5434] - Add support for Thai (th). [SME: 5466] @@ -884,6 +894,7 @@ SME Server module to display support and %prep %setup +%patch0 -p1 cp %{SOURCE1} root/etc/e-smith/web/common cp %{SOURCE2} root/etc/e-smith/web/common