--- rpms/php/sme8/php.spec	2011/06/20 19:27:01	1.3
+++ rpms/php/sme8/php.spec	2011/09/13 14:05:18	1.4
@@ -18,7 +18,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.3.3
-Release: 1%{?dist}.1
+Release: 1%{?dist}.1.0
 License: PHP and LGPLv2 and LGPLv2+
 Group: Development/Languages
 URL: http://www.php.net/
@@ -101,18 +101,19 @@ Group: Development/Languages
 Summary: Common files for PHP
 Provides: php-api = %{apiver}, php-zend-abi = %{zendver}
 Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver}
-Conflicts: php-common
 # Provides for all builtin modules:
 Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
 Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
 Provides: php-reflection, php-session, php-shmop, php-simplexml, php-sockets
 Provides: php-spl, php-tokenizer, php-openssl, php-pcre
 Provides: php-zlib, php-json, php-zip, php-fileinfo
+Obsoletes: php-openssl, php-json
 # For obsoleted pecl extension
 Provides: php-pecl-json = %{jsonver}, php-pecl(json) = %{jsonver}
 Provides: php-pecl-zip = %{zipver}, php-pecl(zip) = %{zipver}
 Provides: php-pecl-phar = %{pharver}, php-pecl(phar) = %{pharver}
 Provides: php-pecl-Fileinfo = %{fileinfover}, php-pecl(Fileinfo) = %{fileinfover}
+Obsoletes: php-pecl-json, php-pecl-zip, php-pecl-phar, php-pecl-Fileinfo
 
 %description common
 The %{name}-common package contains files used by both the php
@@ -728,6 +729,9 @@ rm files.* macros.php
 %files process -f files.process
 
 %changelog
+* Tue Sep 13 2011 Shad L. Lords <slords@mail.com> - 5.3.3-1.1.0
+- Update Obsoletes and Conflicts [SME: 6436]
+
 * Wed Jan 19 2011 Joe Orton <jorton@redhat.com> - 5.3.3-1.1
 - add security fixes for CVE-2010-3710, CVE-2010-4156, 
   CVE-2010-4645 (#670463)