- backport from PHP CVS to fix compilation with PostgreSQL 7.2.x

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 9635079de6eed7cc402a1d6367db6c050de86c02..5f80fc21be5ae0e36652abc1280d0b46b1442674 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -39,12 +39,12 @@
 %define        apxs            /usr/sbin/apxs
 
 %if %{_apache2}
-%define        without_recode          1
-%define        without_mm              1
+%undefine      with_recode
+%undefine      with_mm
 %endif
 
 %ifnarch %{ix86}
-%define        without_msession        1
+%undefine      with_msession
 %endif
 
 Summary:       The PHP HTML-embedded scripting language for use with Apache
@@ -55,7 +55,7 @@ Summary(ru):  PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       4.2.3
-Release:       16
+Release:       17
 Epoch:         3
 Group:         Libraries
 License:       PHP
@@ -99,6 +99,7 @@ Patch24:      %{name}-wrap.patch
 Patch25:       %{name}-sessid.patch
 # similar to CAN-2004-0263(?)
 Patch26:       %{name}-vhost.patch
+Patch27:       %{name}-gd_free.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 BuildRequires: apache-devel
@@ -1355,6 +1356,7 @@ cp php.ini-dist php.ini
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 install -d manual
 bzip2 -dc %{SOURCE3} | tar -xf - -C manual
@@ -1411,7 +1413,7 @@ for i in cgi apxs ; do
        --enable-yp=shared \
        --with-bz2=shared \
        %{?with_cpdf:--with-cpdflib=shared} \
-       --with-cpdflin
+       --with-cpdflin \
        --with-crack=shared \
 %if %{defined with_curl}
        --with-curl=shared \