--- rpms/smeserver-support/sme8/smeserver-support.spec	2010/06/28 15:33:08	1.35
+++ rpms/smeserver-support/sme8/smeserver-support.spec	2012/01/24 12:02:37	1.40
@@ -1,10 +1,10 @@
-# $Id: smeserver-support.spec,v 1.34 2010/05/25 15:31:38 slords Exp $
+# $Id: smeserver-support.spec,v 1.39 2012/01/19 20:13:08 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 16
+%define release 21
 
 # 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
@@ -132,6 +133,7 @@ Requires: smeserver-locale-sv
 Requires: smeserver-locale-th
 Requires: smeserver-locale-tr
 Requires: smeserver-locale-zh_CN
+Requires: smeserver-locale-zh_TW
 
 # These should be re-pulled by other e-smith packages.
 Obsoletes: perl-File-MMagic = 1.22-1
@@ -191,6 +193,19 @@ Conflicts: dmc-mitel-mailrules
 
 Obsoletes: php5-cgi
 Conflicts: php5-cgi
+Obsoletes: php5-cgi-imap
+Conflicts: php5-cgi-imap
+Obsoletes: php5-cgi-ldap
+Conflicts: php5-cgi-ldap
+Obsoletes: php5-cgi-mysql
+Conflicts: php5-cgi-mysql
+Obsoletes: php5-cgi-pear
+Conflicts: php5-cgi-pear
+Obsoletes: php5-cgi-xmlrpc
+Conflicts: php5-cgi-xmlrpc
+Obsoletes: smeserver-php5-cgi
+
+Obsoletes: php-mcrypt
 
 # This block used to be in the SMEServer RPM. Many are probably 
 # redundant or should be elsewhere or removed
@@ -257,6 +272,21 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* Tue Jan 24 2012 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-21.sme
+- Obsolete smeserver-php5-cgi [SME: 6652]
+
+* Thu Jan 19 2012 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-20.sme
+- Obsolete php-mcrypt [SME: 6814]
+
+* Wed Sep 28 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-19.sme
+- Remove php5 property for ibays [SME: 6652]
+
+* Tue Jul 13 2010 Shad L. Lords <slords@mail.com> - 2.2.0-18.sme
+- Add support for Chinese (Taiwan) (zh_TW). [SME: 6106]
+
+* Tue Jun 29 2010 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-17.sme
+- Add Obsoletes for php5-cgi-{imap,ldap,mysql,pear,xmlrpc}. [SME: 6089]
+
 * Mon Jun 28 2010 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-16.sme
 - Add Obsoletes for php5-cgi. [SME: 6089]
 
@@ -911,6 +941,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