- release 12: rebuild against ucd-snmp 4.2.3.

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 0ec05bd3ab37b2ec92913ae0345e3043f1d6ccc4..426b0f0a9d03799b8945b1758ed3837b811e8263 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -16,40 +16,46 @@ 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:       2
+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
 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: freetype-devel >= 2.0
 BuildRequires: gd-devel >= 2.0.1
@@ -70,13 +76,13 @@ 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
@@ -86,9 +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
-BuildRequires: sablotron-devel
-BuildRequires: expat-devel
-BuildRequires: w3c-libwww-devel
+%{?_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
@@ -146,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
@@ -162,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.
@@ -177,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
@@ -195,6 +210,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}
 PreReq:                pdflib
 
@@ -214,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
@@ -233,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
 
@@ -253,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
 
@@ -273,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
@@ -293,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
@@ -312,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
@@ -333,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
@@ -349,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
@@ -366,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
@@ -382,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
@@ -399,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
@@ -415,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
@@ -432,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
@@ -450,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
@@ -467,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
@@ -484,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
@@ -500,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
@@ -518,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
@@ -534,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
@@ -551,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
@@ -567,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
 
@@ -584,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
@@ -600,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
@@ -616,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
@@ -632,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
@@ -648,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
@@ -664,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
@@ -680,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
@@ -696,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
@@ -710,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,
@@ -720,23 +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:        XML
+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
-XML.
+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
@@ -753,48 +874,57 @@ 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
 This is a dynamic shared object (DSO) for Apache that will add curl
 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
-#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
-#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.
+%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
@@ -802,12 +932,20 @@ support to PHP.
 %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
@@ -841,7 +979,12 @@ for i in cgi apxs ; do
        --with-mysql=shared,/usr \
        --with-mysql-sock=/var/lib/mysql/mysql.sock \
        --with-gd=shared \
+       --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 \
@@ -856,8 +999,6 @@ for i in cgi apxs ; do
        --with-mm \
        --with-pcre-regex=shared \
        --enable-posix=shared \
-       --with-freetype-dir=shared \
-       --with-t1lib \
        --with-recode=shared \
        --enable-ucd-snmp-hack \
        --enable-dba=shared \
@@ -883,7 +1024,7 @@ for i in cgi apxs ; do
        --with-dom=shared \
     %{?_with_xslt:--enable-xslt=shared} \
     %{?_with_xslt:--with-xslt-sablot=shared} \
-    %{?_with_xslt:--enable-wddx=shared} \
+    %{?_with_wddx:--enable-wddx=shared} \
        --with-pear=%{peardir}
 done
 
@@ -921,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 \
@@ -1089,6 +1227,7 @@ 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