--- rpms/smeserver-support/sme8/smeserver-support.spec	2009/10/27 18:14:57	1.29
+++ rpms/smeserver-support/sme8/smeserver-support.spec	2010/07/13 18:09:10	1.37
@@ -1,17 +1,18 @@
-# $Id: smeserver-support.spec,v 1.28 2009/10/26 22:22:07 slords Exp $
+# $Id: smeserver-support.spec,v 1.36 2010/06/29 14:47:51 charliebrady 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 18
 
-# 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
 
 # TODO: check mkinitrd,mdadm to see if needed
-%define centos_excludes initscripts
+%define centos_excludes initscripts,libgsf
+%define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm
 
 Version: %{version}
 Release: %{release}%{?dist}
@@ -20,6 +21,8 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Source1: smeserver_logo.jpg
 Source2: smeserver_logo.gif
+Patch0: smeserver-support.bug5656.patch
+Patch1: smeserver-support-2.2.0-migrate_excludes.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -112,6 +115,7 @@ Requires: smeserver-locale-el
 Requires: smeserver-locale-es
 Requires: smeserver-locale-et
 Requires: smeserver-locale-fr
+Requires: smeserver-locale-he
 Requires: smeserver-locale-hu
 Requires: smeserver-locale-id
 Requires: smeserver-locale-it
@@ -128,6 +132,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
@@ -185,6 +190,19 @@ Conflicts: e-smith-userpanel
 Obsoletes: dmc-mitel-mailrules
 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
+
 # This block used to be in the SMEServer RPM. Many are probably 
 # redundant or should be elsewhere or removed
 # [SF: 1356225]
@@ -250,6 +268,30 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* 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]
+
+* Tue May 25 2010 Shad L. Lords <slords@mail.com> - 2.2.0-15.sme
+- Add support for Hebrew (he). [SME: 5971]
+
+* Mon May 17 2010 Shad L. Lords <slords@mail.com> 2.2.0-14.sme
+- Add migrate fragment for centos excludes [SME: 5960]
+
+* Mon May 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-13.sme
+- Reverting previous change [SME: 5962]
+
+* Mon May 17 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-12.sme
+- Migrate CentOS Exclude property default values to smeserver-yum [SME: 5962]
+
+* Wed Dec  9 2009 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-11.sme
+- Fix css validation errors. [SME: 5656]
+
 * Tue Oct 27 2009 Shad L. Lords <slords@mail.com> 2.2.0-10.sme
 - Add support for Polish (pl). [SME: 5434]
 - Add support for Thai (th). [SME: 5466]
@@ -884,6 +926,8 @@ SME Server module to display support and
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 cp %{SOURCE1} root/etc/e-smith/web/common
 cp %{SOURCE2} root/etc/e-smith/web/common
 
@@ -898,6 +942,8 @@ do
     mkdir -p $YUM_REPOS/defaults/$dir
     echo %{centos_excludes} > $YUM_REPOS/defaults/$dir/Exclude
 done
+sed -i 's/CENTOS_EXCLUDES/%{centos_excludes}/' $YUM_REPOS/migrate/25CentOSExcludes
+sed -i 's/CENTOS_REMOVE/%{centos_remove}/' $YUM_REPOS/migrate/25CentOSExcludes
 
 %install
 rm -rf $RPM_BUILD_ROOT