--- rpms/php/sme8/php.spec	2011/11/03 22:49:53	1.5.2.1
+++ rpms/php/sme8/php.spec	2012/02/03 15:51:39	1.8
@@ -18,7 +18,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.3.3
-Release: 1%{?dist}.3
+Release: 1%{?dist}.6
 License: PHP and LGPLv2 and LGPLv2+
 Group: Development/Languages
 URL: http://www.php.net/
@@ -68,6 +68,9 @@ Patch218: php-5.3.3-CVE-2011-1471.patch
 Patch219: php-5.3.3-CVE-2011-1938.patch
 Patch220: php-5.3.3-CVE-2011-2202.patch
 Patch221: php-5.3.3-CVE-2011-2483.patch
+Patch222: php-5.3.3-CVE-2011-4885.patch
+Patch223: php-5.3.3-CVE-2011-4566.patch
+Patch224: php-5.3.3-CVE-2012-0830.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -111,18 +114,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
@@ -261,6 +265,7 @@ 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
+Obsoletes: php-domxml, php-dom
 
 %description xml
 The php-xml package contains dynamic shared objects which add support
@@ -371,6 +376,10 @@ support for using the ICU library to PHP
 %patch219 -p1 -b .cve1938
 %patch220 -p1 -b .cve2202
 %patch221 -p1 -b .cve2483
+%patch222 -p1 -b .cve4885
+%patch223 -p1 -b .cve4566
+%patch224 -p1 -b .cve0830
+
 
 # Prevent %%doc confusion over LICENSE files
 cp -p Zend/LICENSE Zend/ZEND_LICENSE
@@ -695,7 +704,7 @@ rm files.* macros.php
 %defattr(-,root,root)
 %doc CODING_STANDARDS CREDITS INSTALL LICENSE NEWS README*
 %doc Zend/ZEND_* TSRM_LICENSE regex_COPYRIGHT
-%doc php.ini-*
+%doc php.ini-production php.ini-development
 %config(noreplace) %{_sysconfdir}/php.ini
 %dir %{_sysconfdir}/php.d
 %dir %{_libdir}/php
@@ -748,6 +757,19 @@ rm files.* macros.php
 %files process -f files.process
 
 %changelog
+* Fri Feb 3 2012 Shad L. Lords <slords@mail.com> - 5.3.3-1.6.sme
+- Obsolete php-domxml and php-dom [SME: 6733]
+- Update Obsoletes and Conflicts [SME: 6436]
+
+* Thu Feb  2 2012 Joe Orton <jorton@redhat.com> - 5.3.3-1.6
+- add security fix for CVE-2012-0830 (#786757)
+
+* Wed Jan 04 2012 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 5.3.3-1.5
+- remove extra php.ini-prod/devel files caused by %%patch -b
+
+* Tue Jan 03 2012 Vojtech Vitek (V-Teq) <vvitek@redhat.com> - 5.3.3-1.4
+- add security fixes for CVE-2011-4885, CVE-2011-4566 (#769758)
+
 * Mon Oct 24 2011 Joe Orton <jorton@redhat.com> - 5.3.3-1.3
 - improve CVE-2011-1466 fix to cover CAL_GREGORIAN, CAL_JEWISH