--- rpms/smeserver-support/sme8/smeserver-support.spec 2011/09/28 17:02:40 1.38 +++ rpms/smeserver-support/sme8/smeserver-support.spec 2012/01/19 20:13:08 1.39 @@ -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.38 2011/09/28 17:02:40 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 20 # 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 @@ -204,6 +204,8 @@ Conflicts: php5-cgi-pear Obsoletes: php5-cgi-xmlrpc Conflicts: php5-cgi-xmlrpc +Obsoletes: php-mcrypt + # This block used to be in the SMEServer RPM. Many are probably # redundant or should be elsewhere or removed # [SF: 1356225] @@ -269,6 +271,9 @@ Conflicts: dungog-mailblocking Obsoletes: rkhunter <= 1.3.4-7.el5.sme %changelog +* Thu Jan 19 2012 Jonathan Martens 2.2.0-20.sme +- Obsolete php-mcrypt [SME: 6814] + * Wed Sep 28 2011 Jonathan Martens 2.2.0-19.sme - Remove php5 property for ibays [SME: 6652]