- release 12: rebuild against ucd-snmp 4.2.3.

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index f174bbbbae2b6693441181ff72850ccf8f3b363c..426b0f0a9d03799b8945b1758ed3837b811e8263 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -4,6 +4,8 @@
 # _with_oci8    - with oci8 support
 # _with_java    - with Java support
 # _with_openssl - with OpenSSL support
+# _with_wddx    - with WDDX support
+# _with_xslt    - with XSLT support
 # _without_imap   - without IMAP support
 # _without_ldap   - without LDAP support
 # _without_odbc   - without ODBC support
@@ -14,45 +16,51 @@ Summary(fr):        Le langage de script embarque-HTML PHP pour Apache
 Summary(pl):   Jêzyk skryptowy PHP -- u¿ywany wraz z serwerem Apache
 Name:          php
 Version:       4.0.6
-Release:       0.1
+Release:       12
 Epoch:         1
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 License:       The PHP license (see "LICENSE" file included in distribution)
 Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.gz
 Source1:       FAQ.php
 Source2:       %{name}.ini
 Source3:       zend.gif
-Source4:       http://www.php.net/distributions/manual.tar.gz
+Source4:       http://www.php.net/distributions/manual/php_manual_en.tar.bz2
 Source5:       php-module-install
-#Patch0:               %{name}-imap.patch
+Patch0:                %{name}-imap.patch
 Patch1:                %{name}-mysql-socket.patch
 Patch2:                %{name}-mail.patch
 Patch3:                %{name}-link-libs.patch
-#Patch4:               %{name}-DESTDIR.patch
-#Patch5:               %{name}-gd-shared.patch
-Patch6:                %{name}-session-path.patch
-#Patch7:               %{name}-libtool_version_check_fix.patch
-#Patch8:               %{name}-pdflib.patch
-Patch9:                %{name}-am_ac_lt.patch
-Patch10:       %{name}-fastcgi.patch
-Patch11:       %{name}-shared.patch
-Patch12:       %{name}-ac250.patch
-Patch13:       %{name}-pearinstall.patch
+Patch4:                %{name}-session-path.patch
+Patch5:                %{name}-am_ac_lt.patch
+Patch6:                %{name}-fastcgi.patch
+Patch7:                %{name}-shared.patch
+Patch8:                %{name}-ac250.patch
+Patch9:                %{name}-pearinstall.patch
+Patch10:       %{name}-pldlogo.patch
+Patch11:       %{name}-libxml2.patch
+Patch12:       %{name}-mailsecurity2.patch
+Patch13:       %{name}-ZVAL.patch
+Patch14:       %{name}-oracle9.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 BuildRequires: apache(EAPI)-devel
 BuildRequires: zip
 BuildRequires: bison
 BuildRequires: flex
+BuildRequires: perl
+BuildRequires: pkgconfig
 BuildRequires: db3-devel >= 3.1.17
-BuildRequires: freetype1-devel
-BuildRequires: gd-devel >= 1.8.3
+BuildRequires: freetype-devel >= 2.0
+BuildRequires: gd-devel >= 2.0.1
 BuildRequires: gdbm-devel
-%{!?_without_imap:BuildRequires: imap-devel >= 1:2001-0.BETA }
+%{!?_without_imap:BuildRequires: imap-devel >= 1:2001-0.BETA.200107022325.2 }
 # I think jdk is better for java
 # BuildRequires:       jdk
 %{?_with_java:BuildRequires:   kaffe-devel}
@@ -60,19 +68,21 @@ BuildRequires:      libjpeg-devel
 BuildRequires: libltdl-devel >= 1.4
 BuildRequires: libpng >= 1.0.8
 BuildRequires: libtiff-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 1.4
+BuildRequires: automake >= 1.4d
+BuildRequires: autoconf >= 1.4
 BuildRequires: mm-devel >= 1.1.3
 BuildRequires: mysql-devel >= 3.23.32
 %{!?_without_ldap:BuildRequires: openldap-devel >= 2.0}
 BuildRequires: pam-devel
 BuildRequires: pdflib-devel >= 4.0.0
-#BuildRequires:        libxml-devel >= 2.0.0
+BuildRequires: libxml2-devel >= 2.2.7
 BuildRequires: postgresql-devel
 BuildRequires: recode-devel >= 3.5d-3
 BuildRequires: t1lib-devel
 %{!?_without_odbc:BuildRequires: unixODBC-devel}
 BuildRequires: zlib-devel >= 1.0.9
-%{!?_without_snmp:BuildRequires: ucd-snmp-devel >= 4.2.1-8}
+%{!?_without_snmp:BuildRequires: ucd-snmp-devel >= 4.2.3}
 BuildRequires: libmcrypt-devel >= 2.4.4
 BuildRequires: mhash-devel
 BuildRequires: bzip2-devel
@@ -82,6 +92,9 @@ BuildRequires:        curl-devel
 %if %(expr %{?_with_openssl:1}%{!?_with_openssl:0} + %{!?_without_ldap:1}%{?_without_ldap:0})
 BuildRequires: openssl-devel >= 0.9.6a
 %endif
+%{?_with_xslt:BuildRequires:   sablotron-devel}
+%{?_with_xslt:BuildRequires:   expat-devel}
+%{?_with_xslt:BuildRequires:   w3c-libwww-devel}
 Prereq:                apache(EAPI) >= 1.3.9
 Prereq:                perl
 Prereq:                %{_sbindir}/apxs
@@ -139,6 +152,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description cgi
@@ -155,6 +171,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 
 %description common
 Common files needed by both apache module and CGI.
@@ -170,6 +189,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description mysql
@@ -180,6 +202,28 @@ should install this package in addition to the main %{name} package.
 %description mysql -l pl
 Modu³ PHP umo¿liwiaj±cy dostêp do bazy danych MySQL.
 
+%package pdf
+Summary:       libPDF module for PHP
+Summary(pl):   Modu³ do tworzenia plików PDF dla PHP
+Group:         Libraries
+Group(de):     Libraries
+Group(es):     Bibliotecas
+Group(fr):     Librairies
+Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
+PreReq:                %{name}-common = %{version}
+PreReq:                pdflib
+
+%description pdf
+This is a dynamic shared object (DSO) for Apache that will add PDF
+support to PHP.
+
+%description pdf -l pl
+Modu³ PHP umo¿liwiaj±cy tworzenie plików PDF. Wykorzystuje bibliotekê
+pdflib.
+
 %package pgsql
 Summary:       PostgreSQL database module for PHP
 Summary(pl):   Modu³ bazy danych PostgreSQL dla PHP
@@ -188,6 +232,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description pgsql
@@ -207,6 +254,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 Autoreq:       false
 
@@ -227,6 +277,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 Autoreq:       false
 
@@ -247,6 +300,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description gd
@@ -267,6 +323,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description java
@@ -286,6 +345,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description xml
@@ -307,6 +369,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description dba
@@ -323,6 +388,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description odbc
@@ -340,6 +408,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description calendar
@@ -356,6 +427,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description dbase
@@ -373,6 +447,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description filepro
@@ -389,6 +466,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description posix
@@ -406,6 +486,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description pcre
@@ -424,6 +507,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description sysvsem
@@ -441,6 +527,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description sysvshm
@@ -458,6 +547,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description yp
@@ -474,6 +566,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description bcmath
@@ -492,6 +587,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description ftp
@@ -508,6 +606,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description zlib
@@ -525,6 +626,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description exif
@@ -541,6 +645,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 Requires:      recode >= 3.5d-3
 
@@ -558,6 +665,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description session
@@ -574,6 +684,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description gettext
@@ -590,6 +703,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description snmp
@@ -606,6 +722,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description imap
@@ -622,6 +741,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description ldap
@@ -638,6 +760,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description sockets
@@ -654,6 +779,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description mcrypt
@@ -670,6 +798,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description mhash
@@ -684,6 +815,7 @@ Summary(pl):        Dokumentacja dla PHP
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
+Obsoletes:     php-manual
 
 %description doc
 Comprehensive documentation for PHP, viewable through your web server,
@@ -694,16 +826,38 @@ Dokumentacja dla pakietu PHP. Mo
 WWW.
 
 %package pear
-Summary:       PEAR
+Summary:       PEAR - PHP Extension and Application Repository
+Summary(pl):   PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
 Group:         Development/Languages/PHP
+Group(de):     Entwicklung/Sprachen/PHP
+Group(pl):     Programowanie/Jêzyki/PHP
 
 %description pear
-PEAR.
+PEAR - PHP Extension and Application Repository.
+
+%description pear -l pl
+PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
+Repozytorium Aplikacji.
+
+%package domxml
+Summary:        DOM XML module
+Summary(pl):   Modu³ DOM XML
+Group:          Development/Languages/PHP
+Group(de):     Entwicklung/Sprachen/PHP
+Group(pl):     Programowanie/Jêzyki/PHP
+
+%description domxml
+DOM XML module.
+
+%description domxml -l pl
+Modu³ DOM XML.
 
 %package devel
 Summary:       Files for PHP modules development
 Summary(pl):   Pliki do kompilacji modu³ów PHP
 Group:         Development/Languages/PHP
+Group(de):     Entwicklung/Sprachen/PHP
+Group(pl):     Programowanie/Jêzyki/PHP
 Requires:      %{name}-common = %{version}
 
 %description devel
@@ -720,6 +874,9 @@ Group(de):  Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 PreReq:                %{name}-common = %{version}
 
 %description curl
@@ -729,17 +886,66 @@ support to PHP.
 %description curl -l pl
 Modu³ PHP umo¿liwiaj±cy korzystanie z biblioteki curl.
 
+%package xslt
+Summary:       xslt extension module for PHP
+Summary(pl):   Modu³ xslt dla PHP
+Group:         Libraries
+Group(de):     Libraries
+Group(es):     Bibliotecas
+Group(fr):     Librairies
+Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
+PreReq:                %{name}-common = %{version}
+
+%description xslt
+This is a dynamic shared object (DSO) for Apache that will add xslt
+support to PHP.
+
+%description xslt -l pl
+Modu³ PHP umo¿liwiaj±cy korzystanie z technologii xslt.
+
+%package wddx
+Summary:       wddx extension module for PHP
+Summary(pl):   Modu³ wddx dla PHP
+Group:         Libraries
+Group(de):     Libraries
+Group(es):     Bibliotecas
+Group(fr):     Librairies
+Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
+PreReq:                %{name}-common = %{version}
+
+%description wddx
+This is a dynamic shared object (DSO) for Apache that will add wddx
+support to PHP.
+
+%description wddx -l pl
+Modu³ PHP umo¿liwiaj±cy korzystanie z wddx.
+
 %prep
 %setup  -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch6 -p1 
+%patch4 -p1 
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+
+install -d manual
+bzip2 -dc %{SOURCE4} | tar -xf - -C manual
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI -I/usr/X11R6/include"; export CFLAGS
@@ -773,7 +979,12 @@ for i in cgi apxs ; do
        --with-mysql=shared,/usr \
        --with-mysql-sock=/var/lib/mysql/mysql.sock \
        --with-gd=shared \
-       --enable-gd-imgstrttf \
+       --with-jpeg-dir=shared \
+       --with-zlib-dir=shared \
+       --with-png-dir=shared \
+       --enable-gd-native-ttf \
+       --with-freetype-dir=shared \
+       --with-t1lib=shared \
        --with-dbase=shared \
        --with-filepro=shared \
        --enable-ftp=shared \
@@ -782,14 +993,12 @@ for i in cgi apxs ; do
        --with-cpdflib=shared \
        %{?_with_java:--with-java} \
        --with-pgsql=shared,/usr \
-       %{!?_without_imap:--with-imap=shared} \
+       %{!?_without_imap:--with-imap=shared --with-imap-ssl} \
        --enable-bcmath=shared \
        --enable-calendar=shared \
        --with-mm \
        --with-pcre-regex=shared \
        --enable-posix=shared \
-       --with-ttf \
-       --with-t1lib \
        --with-recode=shared \
        --enable-ucd-snmp-hack \
        --enable-dba=shared \
@@ -812,12 +1021,15 @@ for i in cgi apxs ; do
        %{?_with_oracle:--with-oracle=shared} \
        %{?_with_oci8:--with-oci8=shared} \
        --without-db2 \
+       --with-dom=shared \
+    %{?_with_xslt:--enable-xslt=shared} \
+    %{?_with_xslt:--with-xslt-sablot=shared} \
+    %{?_with_wddx:--enable-wddx=shared} \
        --with-pear=%{peardir}
 done
 
 # TODO --with-pspell=/usr,shared (pspell missing)
-
-# --with-dom need libxml >= 2.2.7 \
+#      --with-qtdom=shared
 
 %{__make}
 %{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" -C sapi/cgi
@@ -850,9 +1062,6 @@ install %{SOURCE2}         $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 install %{SOURCE3} php4.gif    $RPM_BUILD_ROOT/home/httpd/icons
 install %{SOURCE5} $RPM_BUILD_ROOT/%{_sbindir}
 
-mkdir manual
-tar zxf %{SOURCE4} -C manual
-ln -s manual.html manual/index.html
 
 install %{SOURCE1} .
 gzip -9nf CODING_STANDARDS CREDITS \
@@ -1007,6 +1216,22 @@ if [ "$1" = "0" ]; then
         %{_sbindir}/php-module-install remove mysql %{_sysconfdir}/php.ini
 fi
 
+%post pdf
+%{_sbindir}/php-module-install install libpdf_php %{_sysconfdir}/php.ini
+
+%preun pdf
+if [ "$1" = "0" ]; then
+        %{_sbindir}/php-module-install remove libpdf_php %{_sysconfdir}/php.ini
+fi
+
+%preun domxml
+if [ "$1" = "0" ]; then
+       %{_sbindir}/php-module-install remove domxml %{_sysconfdir}/php.ini
+fi
+
+%post domxml
+%{_sbindir}/php-module-install install domxml %{_sysconfdir}/php.ini
+
 %if %{?_with_oci8:1}%{!?_with_oci8:0}
 %post oci8
 %{_sbindir}/php-module-install install oci8 %{_sysconfdir}/php.ini
@@ -1143,6 +1368,22 @@ if [ "$1" = "0" ]; then
         %{_sbindir}/php-module-install remove curl %{_sysconfdir}/php.ini
 fi
 
+#%post xslt
+#%{_sbindir}/php-module-install install xslt %{_sysconfdir}/php.ini
+#
+#%preun xslt
+#if [ "$1" = "0" ]; then
+#        %{_sbindir}/php-module-install remove xslt %{_sysconfdir}/php.ini
+#fi
+#
+#%post wddx
+#%{_sbindir}/php-module-install install wddx %{_sysconfdir}/php.ini
+#
+#%preun wddx
+#if [ "$1" = "0" ]; then
+#        %{_sbindir}/php-module-install remove wddx %{_sysconfdir}/php.ini
+#fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1179,6 +1420,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/phpize
 %attr(755,root,root) %{_bindir}/php-config
 
+%files domxml
+%defattr(644,root,root,755)
+%attr(755,root,root) %{extensionsdir}/domxml.so
+
 %files pear
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pear
@@ -1188,6 +1433,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/mysql.so
 
+%files pdf
+%defattr(644,root,root,755)
+%attr(755,root,root) %{extensionsdir}/libpdf_php.so
+
 %files pgsql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pgsql.so
@@ -1326,3 +1575,11 @@ rm -rf $RPM_BUILD_ROOT
 %files curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/curl.so
+
+#%files xslt
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{extensionsdir}/xslt.so
+#
+#%files wddx
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{extensionsdir}/wddx.so