--- rpms/php/sme8/php.spec	2012/06/29 14:45:08	1.5.2.3
+++ rpms/php/sme8/php.spec	2012/08/23 02:39:15	1.10
@@ -18,7 +18,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.3.3
-Release: 13%{?dist}
+Release: 13%{?dist}.1
 License: PHP and LGPLv2 and LGPLv2+
 Group: Development/Languages
 URL: http://www.php.net/
@@ -90,6 +90,7 @@ BuildRequires: zlib-devel, pcre-devel >=
 BuildRequires: bzip2, perl, libtool >= 1.4.3, gcc-c++
 Requires: httpd-mmn = %{httpd_mmn}
 Provides: mod_php = %{version}-%{release}
+Provides: php53 = %{version}-%{release}, config(php53) = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 # For backwards-compatibility, require php-cli for the time being:
 Requires: %{name}-cli = %{version}-%{release}
@@ -111,7 +112,7 @@ language to Apache HTTP Server.
 Group: Development/Languages
 Summary: Command-line interface for PHP
 Requires: %{name}-common = %{version}-%{release}
-Provides: php-cgi = %{version}-%{release}, php-cli = %{version}-%{release}
+Provides: php-cgi = %{version}-%{release}, php53-cli = %{version}-%{release}
 Provides: php-pcntl
 
 %description cli
@@ -123,18 +124,20 @@ 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
+Provides: php53-common = %{version}-%{release}, config(php53-common) = %{version}-%{release}
+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
@@ -144,7 +147,7 @@ package and the php-cli package.
 Group: Development/Libraries
 Summary: Files needed for building PHP extensions
 Requires: %{name} = %{version}-%{release}, autoconf, automake
-Provides: php-devel = %{version}-%{release}
+Provides: php53-devel = %{version}-%{release}, config(php53-devel) = %{version}-%{release}
 
 %description devel
 The php-devel package contains the files needed for building PHP
@@ -156,7 +159,7 @@ Summary: A module for PHP applications t
 Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
 BuildRequires: krb5-devel, openssl-devel, libc-client-devel
-Provides: php-imap = %{version}-%{release}
+Provides: php53-imap = %{version}-%{release}, config(php53-imap) = %{version}-%{release}
 
 %description imap
 The php-imap package contains a dynamic shared object that will
@@ -167,7 +170,7 @@ Summary: A module for PHP applications t
 Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
 BuildRequires: cyrus-sasl-devel, openldap-devel, openssl-devel
-Provides: php-ldap = %{version}-%{release}
+Provides: php53-ldap = %{version}-%{release}, config(php53-ldap) = %{version}-%{release}
 
 %description ldap
 The php-ldap package is a dynamic shared object (DSO) for the Apache
@@ -183,7 +186,7 @@ Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
 Provides: php-pdo-abi = %{pdover}
 Provides: php-pdo_sqlite
-Provides: php-pdo = %{version}-%{release}
+Provides: php53-pdo = %{version}-%{release}, config(php53-pdo) = %{version}-%{release}
 
 %description pdo
 The %{name}-pdo package contains a dynamic shared object that will add
@@ -197,7 +200,7 @@ Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}, %{name}-pdo
 Provides: php_database, php-mysqli, php-pdo_mysql
 BuildRequires: mysql-devel >= 4.1.0
-Provides: php-mysql = %{version}-%{release}
+Provides: php53-mysql = %{version}-%{release}, config(php53-mysql) = %{version}-%{release}
 
 %description mysql
 The php-mysql package contains a dynamic shared object that will add
@@ -212,7 +215,7 @@ Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}, %{name}-pdo
 Provides: php_database, php-pdo_pgsql
 BuildRequires: krb5-devel, openssl-devel, postgresql-devel
-Provides: php-pgsql = %{version}-%{release}
+Provides: php53-pgsql = %{version}-%{release}, config(php53-pgsql) = %{version}-%{release}
 
 %description pgsql
 The php-pgsql package includes a dynamic shared object (DSO) that can
@@ -228,7 +231,7 @@ Summary: Modules for PHP script using sy
 Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
 Provides: php-posix, php-sysvsem, php-sysvshm, php-sysvmsg
-Provides: php-process = %{version}-%{release}
+Provides: php53-process = %{version}-%{release}, config(php53-process) = %{version}-%{release}
 
 %description process
 The php-process package contains dynamic shared objects which add
@@ -241,7 +244,7 @@ Requires: %{name}-common = %{version}-%{
 Summary: A module for PHP applications that use ODBC databases
 Provides: php_database, php-pdo_odbc
 BuildRequires: unixODBC-devel
-Provides: php-odbc = %{version}-%{release}
+Provides: php53-odbc = %{version}-%{release}, config(php53-odbc) = %{version}-%{release}
 
 %description odbc
 The php-odbc package contains a dynamic shared object that will add
@@ -257,7 +260,7 @@ Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
 Summary: A module for PHP applications that use the SOAP protocol
 BuildRequires: libxml2-devel
-Provides: php-soap = %{version}-%{release}
+Provides: php53-soap = %{version}-%{release}, config(php53-soap) = %{version}-%{release}
 
 %description soap
 The php-soap package contains a dynamic shared object that will add
@@ -268,7 +271,7 @@ Summary: A module for PHP applications t
 Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}, net-snmp
 BuildRequires: net-snmp-devel
-Provides: php-snmp = %{version}-%{release}
+Provides: php53-snmp = %{version}-%{release}, config(php53-snmp) = %{version}-%{release}
 
 %description snmp
 The php-snmp package contains a dynamic shared object that will add
@@ -282,7 +285,8 @@ Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
 Provides: php-dom, php-xsl, php-domxml, php-wddx
 BuildRequires: libxslt-devel >= 1.0.18-1, libxml2-devel >= 2.4.14-1
-Provides: php-xml = %{version}-%{release}
+Obsoletes: php-domxml, php-dom
+Provides: php53-xml = %{version}-%{release}, config(php53-xml) = %{version}-%{release}
 
 %description xml
 The php-xml package contains dynamic shared objects which add support
@@ -293,7 +297,7 @@ and performing XSL transformations on XM
 Summary: A module for PHP applications which use the XML-RPC protocol
 Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
-Provides: php-xmlrpc = %{version}-%{release}
+Provides: php53-xmlrpc = %{version}-%{release}, config(php53-xmlrpc) = %{version}-%{release}
 
 %description xmlrpc
 The php-xmlrpc package contains a dynamic shared object that will add
@@ -303,7 +307,7 @@ support for the XML-RPC protocol to PHP.
 Summary: A module for PHP applications which need multi-byte string handling
 Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
-Provides: php-mbstring = %{version}-%{release}
+Provides: php53-mbstring = %{version}-%{release}, config(php53-mbstring) = %{version}-%{release}
 
 %description mbstring
 The php-mbstring package contains a dynamic shared object that will add
@@ -315,7 +319,7 @@ Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
 # Required to build the bundled GD library
 BuildRequires: libXpm-devel, libjpeg-devel, libpng-devel, freetype-devel
-Provides: php-gd = %{version}-%{release}
+Provides: php53-gd = %{version}-%{release}, config(php53-gd) = %{version}-%{release}
 
 %description gd
 The php-gd package contains a dynamic shared object that will add
@@ -325,7 +329,7 @@ support for using the gd graphics librar
 Summary: A module for PHP applications for using the bcmath library
 Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
-Provides: php-bcmath = %{version}-%{release}
+Provides: php53-bcmath = %{version}-%{release}, config(php53-bcmath) = %{version}-%{release}
 
 %description bcmath
 The php-bcmath package contains a dynamic shared object that will add
@@ -335,7 +339,7 @@ support for using the bcmath library to
 Summary: A database abstraction layer module for PHP applications
 Group: Development/Languages
 Requires: %{name}-common = %{version}-%{release}
-Provides: php-dba = %{version}-%{release}
+Provides: php53-dba = %{version}-%{release}, config(php53-dba) = %{version}-%{release}
 
 %description dba
 The php-dba package contains a dynamic shared object that will add
@@ -346,7 +350,7 @@ Summary: A module for PHP applications f
 Group: System Environment/Libraries
 Requires: %{name}-common = %{version}-%{release}
 BuildRequires: aspell-devel >= 0.50.0
-Provides: php-pspell = %{version}-%{release}
+Provides: php53-pspell = %{version}-%{release}, config(php53-pspell) = %{version}-%{release}
 
 %description pspell
 The php-pspell package contains a dynamic shared object that will add
@@ -357,7 +361,7 @@ Summary: Internationalization extension
 Group: System Environment/Libraries
 Requires: %{name}-common = %{version}-%{release}
 BuildRequires: libicu-devel >= 3.6
-Provides: php-intl = %{version}-%{release}
+Provides: php53-intl = %{version}-%{release}, config(php53-intl) = %{version}-%{release}
 
 %description intl
 The php-intl package contains a dynamic shared object that will add
@@ -789,6 +793,13 @@ rm files.* macros.php
 %files process -f files.process
 
 %changelog
+* Wed Aug 22 2012 Shad L. Lords <slords@mail.com> - 5.3.3-13.sme.1
+- Add php53-* provides to provide compatibility
+
+* Fri Jun 29 2012 Shad L. Lords <slords@mail.com> - 5.3.3-13.sme
+- Obsolete php-domxml and php-dom [SME: 6733]
+- Update Obsoletes and Conflicts [SME: 6436]
+
 * Mon Jun 25 2012 Joe Orton <jorton@redhat.com> - 5.3.3-13
 - add security fix for CVE-2010-2950