--- rpms/smeserver-support/sme9/smeserver-support.spec	2013/02/02 19:44:17	1.5
+++ rpms/smeserver-support/sme9/smeserver-support.spec	2013/02/08 23:37:39	1.7
@@ -1,10 +1,10 @@
-# $Id: smeserver-support.spec,v 1.4 2013/02/02 15:25:31 slords Exp $
+# $Id: smeserver-support.spec,v 1.6 2013/02/08 03:21:38 wellsi Exp $
 
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
 %define version 2.4.0
-%define release 3
+%define release 5
 
 # 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
@@ -59,7 +59,6 @@ Obsoletes: pythonabi
 Obsoletes: comps
 Obsoletes: fonts-xorg-base
 Obsoletes: pine
-Obsoletes: system-config-keyboard
 Obsoletes: system-config-mouse
 Obsoletes: VFlib2
 Obsoletes: xorg-x11-Mesa-libGL
@@ -71,9 +70,6 @@ Obsoletes: kmod-appletalk-smp
 Obsoletes: kmod-appletalk-xenU
 Obsoletes: netatalk
 
-# SF: 1357548
-Conflicts: selinux-policy-targeted
-
 # XXX - FIXME - pam should require this, shouldn't it?
 Requires: audit-libs
 
@@ -206,7 +202,7 @@ Obsoletes: php5-cgi-xmlrpc
 Conflicts: php5-cgi-xmlrpc
 Obsoletes: smeserver-php5-cgi
 
-Obsoletes: php-mcrypt
+Obsoletes: php-mcrypt <= 5.3
 
 # This block used to be in the SMEServer RPM. Many are probably 
 # redundant or should be elsewhere or removed
@@ -273,6 +269,12 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* Fri Feb 8 2013 Shad L. Lords <slords@mail.com> 2.4.0-5.sme
+- Remove system-config-keyboard and selinux-policy-targeted so installer builds correctly
+
+* Thu Feb 7 2013 Ian Wells <esmith@wellsi.com> 2.4.0-4.sme
+- Obsolete only older php-mcrypt versions <= 5.3 [SME: 7320]
+
 * Sat Feb 3 2013 Shad L. Lords <slords@mail.com> 2.4.0-3.sme
 - Obsolete python-ctypes so upgrades will work [SME: 7273]