- more obsoletes

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index e22eeaac2c95990953e5ba9e9ed8d84f67342d26..ee7e9a095ec8264ad57e422808d59ce56bd4a6a1 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -122,13 +122,13 @@ Summary(pt_BR.UTF-8):     A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       5.3.27
+Version:       5.3.29
 Release:       %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 25ae23a5b9615fe8d33de5b63e1bb788
+# Source0-md5: 9469e240cbe6ac865aeaec89b253dd30
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -143,7 +143,7 @@ Source14:   skip-tests.sh
 Source15:      http://litespeedtech.com/packages/lsapi/%{orgname}-litespeed-%{litespeed_version}.tgz
 # Source15-md5:        69cf9c68d37b5b0b041889294ab305fe
 Patch0:                %{orgname}-shared.patch
-Patch1:                %{orgname}-pldlogo.patch
+Patch1:                %{orgname}-tld.patch
 Patch2:                %{orgname}-mail.patch
 Patch3:                %{orgname}-link-libs.patch
 Patch4:                %{orgname}-libpq_fs_h_path.patch
@@ -189,7 +189,6 @@ Patch49:    %{orgname}-m4-divert.patch
 Patch50:       extension-shared-optional-dep.patch
 Patch51:       spl-shared.patch
 Patch52:       pcre-shared.patch
-Patch53:       fix-test-run.patch
 Patch59:       %{orgname}-systzdata.patch
 Patch60:       %{orgname}-oracle-instantclient.patch
 Patch62:       mcrypt-libs.patch
@@ -436,7 +435,7 @@ Summary:    PHP as CLI interpreter
 Summary(pl.UTF-8):     PHP jako interpreter działający z linii poleceń
 Group:         Development/Languages/PHP
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Obsoletes:     php-program
+Provides:      php-program
 
 %description cli
 PHP as CLI interpreter.
@@ -541,10 +540,12 @@ Requires: libtool >= 2:2.2
 %{?with_embed:Requires:        %{name}-embedded = %{epoch}:%{version}-%{release}}
 %{?with_pcre:Requires: pcre-devel >= 8.10}
 Requires:      shtool
+Obsoletes:     php-devel
 Obsoletes:     php-pear-devel
 Obsoletes:     php4-devel
 Obsoletes:     php52-devel
 Obsoletes:     php54-devel
+Obsoletes:     php53-devel
 
 %description devel
 The php-devel package lets you compile dynamic extensions to PHP.
@@ -1917,7 +1918,6 @@ cp -p php.ini-production php.ini
 %patch50 -p1
 %patch51 -p1
 %patch52 -p1
-%patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch59 -p1
 %patch60 -p1