- rel 6; nasty hack for pgsql+curl problem

Changed files:
    php.spec -> 1.554

diff --git a/php.spec b/php.spec
index 5d40c2059af29900b32f8d60fb763869a7045947..abd29f4aee4de83f482ae249ffa191a5ea0878d7 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -79,7 +79,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 5 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       5.1.2
-%define        _rel 5
+%define        _rel 6
 Release:       %{_rel}%{?with_hardening:hardened}
 Epoch:         4
 License:       PHP
@@ -125,6 +125,10 @@ Patch31:   %{name}-both-apxs.patch
 Patch32:       %{name}-builddir.patch
 Patch33:       %{name}-zlib-for-getimagesize.patch
 Patch34:       %{name}-ini-search-path.patch
+# Very big hack that is sane only with non-thread MPMs.
+# The case with threaded MPMs is lost even without this hack.
+# http://bugs.php.net/bug.php?id=36152
+Patch35:       %{name}-openssl-huge-hack.patch
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
@@ -1563,6 +1567,7 @@ patch -p1 < %{PATCH30} || exit 1
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4