--- rpms/smeserver-support/sme8/smeserver-support.spec	2010/05/17 18:45:54	1.31
+++ rpms/smeserver-support/sme8/smeserver-support.spec	2010/05/17 19:42:00	1.33
@@ -1,10 +1,18 @@
-# $Id: smeserver-support.spec,v 1.30 2009/12/09 20:27:12 charliebrady Exp $
+# $Id: smeserver-support.spec,v 1.32 2010/05/17 19:15:50 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 12
+%define release 14
+
+# 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,libgsf
+%define centos_remove   kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm
 
 Version: %{version}
 Release: %{release}%{?dist}
@@ -14,6 +22,7 @@ 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
@@ -244,6 +253,12 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* 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]
 
@@ -885,6 +900,7 @@ 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
 
@@ -893,6 +909,15 @@ perl createlinks
 
 ln -s initial.cgi root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/index.cgi
 
+YUM_REPOS=root/etc/e-smith/db/yum_repositories/
+for dir in base updates
+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
 (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)