--- rpms/smeserver-support/sme8/smeserver-support.spec	2011/09/28 17:02:40	1.38
+++ 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.37 2010/07/13 18:09:10 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 19
+%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
@@ -203,6 +203,9 @@ 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
@@ -269,6 +272,12 @@ 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]