- fix apache2 handling (now compiles with apache 1.3.x)

- use php-pdf extension from pdflib 4.0.2, not this included in php sources
  (this is imposible to build php-pdf module from pdflib.spec because depends
  on php-gd module sources)
- no --with-xml option to ./configure
- disable never enabled xml-rpc extension (build this from external up-to-date spec)

Changed files:
    php.spec -> 1.155

diff --git a/php.spec b/php.spec
index e9e7f4a1ad00873849edaeb161caa23de53c9047..f2e373f5f98d566d490a7bb46f799f7ae1ccbc55 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1,5 +1,5 @@
 #
-%define        _apache2        %(rpm -q apache-devel | grep -Eq '\-2\.[0-9]+\.' 2> /dev/null ; echo $?)
+%define        _apache2        %(if rpm -q apache-devel | grep -Eq '\-2\.[0-9]+\.' 2> /dev/null ; then echo 1; else echo 0; fi)
 
 %if %{_apache2}
 %define _without_recode 1
@@ -50,6 +50,7 @@ Patch9:               %{name}-oracle9.patch
 Patch10:       %{name}-no_%{name}_pcre_in_SAPI_c.patch
 Patch11:       %{name}-libpq_fs_h_path.patch
 Patch12:       %{name}-apache2.patch
+Patch13:       %{name}-pdflib4.0.2.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 BuildRequires: apache(EAPI)-devel
@@ -834,6 +835,7 @@ Modu
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 install -d manual
 bzip2 -dc %{SOURCE4} | tar -xf - -C manual
@@ -850,7 +852,11 @@ for i in cgi apxs ; do
 %configure \
        `[ $i = cgi ] && echo --enable-discard-path` \
        `[ $i = fastcgi ] && echo --enable-discard-path --with-fastcgi=%{_prefix}` \
-       `[ $i = apxs ] && echo --with-apxs%{?_apache2:2}=%{_sbindir}/apxs` \
+%if %{_apache2}        
+       `[ $i = apxs ] && echo --with-apxs2=%{_sbindir}/apxs` \
+%else
+       `[ $i = apxs ] && echo --with-apxs=%{_sbindir}/apxs` \
+%endif 
        --with-config-file-path=%{_sysconfdir} \
        --with-exec-dir=%{_bindir} \
        --%{!?debug:dis}%{?debug:en}able-debug \
@@ -920,7 +926,7 @@ for i in cgi apxs ; do
        %{?_with_wddx:--enable-wddx=shared} \
        --with-zlib=shared \
        --with-zlib-dir=shared \
-       --with-xml=shared \
+       --without-xmlrpc \
        %{?_with_xslt:--with-xslt-sablot=shared}
 done