--- rpms/smeserver-support/sme8/smeserver-support.spec 2010/07/13 18:09:10 1.37 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2011/09/28 17:02:40 1.38 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.36 2010/06/29 14:47:51 charliebrady Exp $ +# $Id: smeserver-support.spec,v 1.37 2010/07/13 18:09:10 slords Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.2.0 -%define release 18 +%define release 19 # 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 @@ -23,6 +23,7 @@ Source1: smeserver_logo.jpg Source2: smeserver_logo.gif Patch0: smeserver-support.bug5656.patch Patch1: smeserver-support-2.2.0-migrate_excludes.patch +Patch2: smeserver-support-2.2.0-obsolete-php5-ibay-property.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch @@ -268,6 +269,9 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Wed Sep 28 2011 Jonathan Martens 2.2.0-19.sme +- Remove php5 property for ibays [SME: 6652] + * Tue Jul 13 2010 Shad L. Lords - 2.2.0-18.sme - Add support for Chinese (Taiwan) (zh_TW). [SME: 6106] @@ -928,6 +932,7 @@ SME Server module to display support and %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 cp %{SOURCE1} root/etc/e-smith/web/common cp %{SOURCE2} root/etc/e-smith/web/common