--- rpms/smeserver-support/sme9/smeserver-support.spec	2013/01/31 19:45:51	1.1
+++ rpms/smeserver-support/sme9/smeserver-support.spec	2013/03/11 18:25:00	1.8
@@ -1,10 +1,10 @@
-# $Id: smeserver-support.spec,v 1.40 2012/01/24 12:02:37 snetram Exp $
+# $Id: smeserver-support.spec,v 1.7 2013/02/08 23:37:39 slords Exp $
 
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
 %define version 2.4.0
-%define release 1
+%define release 6
 
 # 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
@@ -31,6 +31,10 @@ Obsoletes: e-smith-keys
 Obsoletes: e-smith-support
 AutoReqProv: no
 
+# remove old sme8 packages that prevent upgrades
+Obsoletes: kudzu
+Obsoletes: python-ctypes < 1.0.3
+
 # remove old kernels that prevent upgrades
 Obsoletes: kernel < 2.6.17
 Obsoletes: kernel-smp < 2.6.17
@@ -55,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
@@ -67,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
 
@@ -78,6 +78,11 @@ Requires: smolt
 Requires: screen
 Requires: smeserver-yum
 Obsoletes: yum = 1.0.3-6.0.7.x.esmith
+Obsoletes: m2crypto <= 0.16
+Obsoletes: mcstrans <= 0.2.11
+Obsoletes: net-snmp <= 5.3.2.2
+Obsoletes: net-snmp-utils <= 5.3.2.2
+Obsoletes: postgresql-libs <= 8.1.23
 Requires: smeserver-clamav
 Requires: e-smith-spamassassin
 Requires: smeserver-audittools
@@ -202,7 +207,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
@@ -269,6 +274,21 @@ Conflicts: dungog-mailblocking
 Obsoletes: rkhunter <= 1.3.4-7.el5.sme
 
 %changelog
+* Mon Mar 11 2013 Shad L. Lords <slords@mail.com> 2.4.0-6.sme
+- Obsolete el5 version of some pacakges [SME: 7273]
+
+* 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]
+
+* Sat Feb 3 2013 Shad L. Lords <slords@mail.com> 2.4.0-2.sme
+- Obsolete kudzu so upgrades will work [SME: 7273]
+
 * Thu Jan 31 2013 Shad L. Lords <slords@mail.com> 2.4.0-1.sme
 - Roll new stream for sme9