X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=c4e28fb26d3a4447a65c9efc30bb5599b85794a1;hp=0faadea9759f91c12e89c705c4a3658770bf489a;hb=90c52aeee8fa1766093b26855a07c9fae6f50007;hpb=9019bb8ac449b5db45b3099ca512ce7ca97e7ac3

diff --git a/php.spec b/php.spec
index 0faadea..c4e28fb 100644
--- a/php.spec
+++ b/php.spec
@@ -1,8 +1,15 @@
 #
+# TODO:
+# - BUILD!!! (more voodoo for multiple SAPIs; fix for new libtool)
+# - fastcgi option in cgi SAPI?
+# - add cli SAPI?
+# - check/update "experimental" in descriptions
+#
 # Automatic pear requirements finding:
 %include	/usr/lib/rpm/macros.php
 
 %define	_apache2	%(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 1 || echo 0)
+%define		apxs		/usr/sbin/apxs
 
 %if %{_apache2}
 %define _without_recode 1
@@ -14,23 +21,38 @@
 %endif
 
 # Conditional build:
-# _with_cpdf		- with cpdf extension module
-# _with_interbase	- with InterBase extension module
-# _with_java		- with Java extension module
-# _with_oci8		- with Oracle oci8 extension module
-# _with_oracle		- with oracle extension module
-# _with_sybase_ct	- with Sybase-CT extension module
+# _with_db3		- use db3 packages instead of db (4.x) for Berkeley DB support
+# _with_interbase_inst	- use InterBase install., not Firebird	(BR: proprietary libs)
+# _with_java		- with Java extension module		(BR: jdk)
+# _with_oci8		- with Oracle oci8 extension module	(BR: proprietary libs)
+# _with_oracle		- with oracle extension module		(BR: proprietary libs)
+# _with_pcntl		- with pcntl extension module		(problems: SEGV on exit)
+# _without_cpdf		- without cpdf extension module
+# _without_curl		- without CURL extension module
 # _without_domxslt	- without DOM XSLT/EXSLT support in DOM XML extension module
+# _without_gif		- build GD extension module with gd library without GIF support
 # _without_imap		- without IMAP extension module
+# _without_interbase	- without InterBase extension module
 # _without_ldap		- without LDAP extension module
+# _without_mhash	- without mhash extension module
+# _without_ming		- without ming extension module
 # _without_mm		- without mm support for session storage
+# _without_mnogosearch	- without mnogosearch extension module
 # _without_msession	- without msession extension module
 # _without_odbc		- without ODBC extension module
-# _without_openssl	- with OpenSSL support
+# _without_openssl	- without OpenSSL support and OpenSSL extension module
+# _without_pcre		- without PCRE extension module
+# _without_pdf		- without PDF extension module
+# _without_pspell	- without pspell extension module
+# _without_pgsql	- without PostgreSQL extension module
 # _without_snmp		- without SNMP extension module
 # _without_recode	- without recode extension module
+# _without_sybase_ct	- without Sybase-CT extension module
 # _without_wddx		- without WDDX extension module
+# _without_xml		- without XML extension module
+# _without_xmlrpc	- without XML-RPC extension module
 # _without_xslt		- without XSLT extension module
+
 Summary:	The PHP HTML-embedded scripting language for use with Apache
 Summary(fr):	Le langage de script embarque-HTML PHP pour Apache
 Summary(pl):	Jêzyk skryptowy PHP -- u¿ywany wraz z serwerem Apache
@@ -38,63 +60,73 @@ Summary(pt_BR):	A linguagem de script PHP
 Summary(ru):	PHP ÷ÅÒÓÉÉ 4 -- ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
 Summary(uk):	PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:		php
-Version:	4.2.1
-Release:	9
+Version:	4.3.0
+Release:	0.1
 Epoch:		3
 Group:		Libraries
-License:	The PHP license (see "LICENSE" file included in distribution)
+License:	PHP
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
 Source1:	FAQ.%{name}
-Source2:	%{name}.ini
-Source3:	zend.gif
-Source4:	http://www.php.net/distributions/manual/%{name}_manual_en.tar.bz2
-Source5:	%{name}-module-install
-Source6:	%{name}-mod_php.conf
-Source7:	%{name}-cgi.ini
-Source8:	%{name}-apache.ini
+Source2:	zend.gif
+Source3:	http://www.php.net/distributions/manual/%{name}_manual_en.tar.bz2
+Source4:	%{name}-module-install
+Source5:	%{name}-mod_%{name}.conf
+Source6:	%{name}-cgi.ini
+Source7:	%{name}-apache.ini
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-pldlogo.patch
-Patch2:		%{name}-mysql-socket.patch
+Patch2:		%{name}-xml-expat-fix.patch
+#Patch2:		%{name}-mysql-socket.patch
 Patch3:		%{name}-mail.patch
 Patch4:		%{name}-link-libs.patch
-Patch5:		%{name}-fastcgi.patch
-Patch6:		%{name}-no_php_pcre_in_SAPI_c.patch
-Patch7:		%{name}-libpq_fs_h_path.patch
-Patch8:		%{name}-wddx-fix.patch
-Patch9:		%{name}-cpdf-fix.patch
-Patch10:	%{name}-session-fix-shared.patch
-Patch11:	%{name}-hyperwave-fix.patch
-Patch12:	%{name}-openssl-for-ext-only.patch
-Patch13:	%{name}-java-fix.patch
-Patch14:	%{name}-mcal-shared-lib.patch
-Patch15:	%{name}-msession-shared-lib.patch
-Patch16:	%{name}-xmlrpc-includes.patch
-Patch17:	%{name}-build_modules.patch
-Patch18:	%{name}-sapi-ini-file.patch
-Patch19:	%{name}-apache2_broken_macro.patch
-Patch20:	%{name}-php_iconv_string_declaration.patch
+#Patch5:		%{name}-fastcgi.patch
+Patch6:		%{name}-libpq_fs_h_path.patch
+Patch7:		%{name}-wddx-fix.patch
+Patch8:		%{name}-cpdf-fix.patch
+#Patch9:		%{name}-session-fix-shared.patch
+Patch10:	%{name}-hyperwave-fix.patch
+Patch11:	%{name}-odbc-fix.patch
+#Patch11:	%{name}-openssl-for-ext-only.patch
+Patch12:	%{name}-java-fix.patch
+Patch13:	%{name}-mcal-shared-lib.patch
+Patch14:	%{name}-msession-shared-lib.patch
+Patch15:	%{name}-build_modules.patch
+#Patch16:	%{name}-sapi-ini-file.patch
+#Patch17:	%{name}-%{name}_iconv_string_declaration.patch
+#Patch18:	%{name}-pear-cosmetic.patch
+#Patch19:	%{name}-mnogosearch.patch
+Patch20:	%{name}-ini.patch
+Patch21:	%{name}-acam.patch
+Patch22:	%{name}-xmlrpc-fix.patch
+#Patch23:	%{name}-iconv-bug18039.patch
+Patch24:	%{name}-db4.patch
 Icon:		php4.gif
 URL:		http://www.php.net/
+%{!?_without_interbase:%{!?_with_interbase_inst:BuildRequires:	Firebird-devel}}
 BuildRequires:	apache-devel
-BuildRequires:	autoconf >= 2.52
-%{?_with_sybase_ct:BuildRequires:	autoconf >= 2.53}
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1.4d
 BuildRequires:	bison
 BuildRequires:	bzip2-devel
 BuildRequires:	cracklib-devel >= 2.7-15
-BuildRequires:	curl-devel
+%{!?_without_curl:BuildRequires:	curl-devel}
 BuildRequires:	cyrus-sasl-devel
-BuildRequires:	db3-devel >= 3.1.17
+%{?_with_db3:BuildRequires:	db3-devel}
+%{!?_with_db3:BuildRequires:	db-devel >= 4.0}
+%if %(expr %{?_without_xml:0}%{!?_without_xml:1} + %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1})
 BuildRequires:	expat-devel
+%endif
 BuildRequires:	flex
-%{?_with_sybase_ct:BuildRequires:	freetds-devel}
+%{!?_without_sybase_ct:BuildRequires:	freetds-devel}
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gd-devel >= 2.0.1
+%{!?_without_gif:BuildRequires:	gd-devel(gif)}
+%{?_without_gif:BuildConflicts: gd-devel(gif)}
 BuildRequires:	gdbm-devel
 BuildRequires:	gmp-devel
 %{!?_without_imap:BuildRequires: imap-devel >= 1:2001-0.BETA.200107022325.2 }
 %{?_with_java:BuildRequires:	jdk >= 1.1}
-%{?_with_cpdf:BuildRequires:	libcpdf-devel >= 2.02r1-2}
+%{!?_without_cpdf:BuildRequires:	libcpdf-devel >= 2.02r1-2}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel >= 1.4
 BuildRequires:	libmcal-devel
@@ -102,46 +134,46 @@ BuildRequires:	libmcrypt-devel >= 2.4.4
 BuildRequires:	libpng >= 1.0.8
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 0:1.4.2-9
-BuildRequires:	libxml2-devel >= 2.2.7
-%{!?_without_domxslt:BuildRequires:	libxslt >= 1.0.3}
-BuildRequires:	mhash-devel
-BuildRequires:	ming-devel >= 0.1.0
+%{!?_without_xml:BuildRequires:	libxml2-devel >= 2.2.7}
+%{!?_without_domxslt:BuildRequires:	libxslt-devel >= 1.0.3}
+%{!?_without_mhash:BuildRequires:	mhash-devel}
+%{!?_without_ming:BuildRequires:	ming-devel >= 0.1.0}
 %{!?_without_mm:BuildRequires:	mm-devel >= 1.1.3}
-BuildRequires:	mnogosearch-devel < 3.2.5
+%{!?_without_mnogosearch:BuildRequires:	mnogosearch-devel >= 3.2.6}
 BuildRequires:	mysql-devel >= 3.23.32
 %{!?_without_ldap:BuildRequires: openldap-devel >= 2.0}
 %if %(expr %{?_without_openssl:0}%{!?_without_openssl:1} + %{?_without_ldap:0}%{!?_without_ldap:1})
 BuildRequires:	openssl-devel >= 0.9.6a
 %endif
 BuildRequires:	pam-devel
-BuildRequires:	pdflib-devel >= 4.0.0
+%{!?_without_pdf:BuildRequires:	pdflib-devel >= 4.0.0}
 BuildRequires:	perl
 %{!?_without_msession:BuildRequires:	phoenix-devel}
-BuildRequires:	pkgconfig
-BuildRequires:	postgresql-devel
-BuildRequires:	postgresql-backend-devel >= 7.2
-BuildRequires:	pspell-devel
+%{!?_without_pgsql:BuildRequires:	postgresql-devel}
+%{!?_without_pgsql:BuildRequires:	postgresql-backend-devel >= 7.2}
+%{!?_without_pspell:BuildRequires:	pspell-devel}
 %{!?_without_recode:BuildRequires:	recode-devel >= 3.5d-3}
-BuildRequires:	rpm-php-pearprov >= 4.0.2-80
+BuildRequires:	rpm-php-pearprov >= 4.0.2-100
 %{!?_without_xslt:BuildRequires:	sablotron-devel}
 BuildRequires:	t1lib-devel
-%{!?_without_snmp:BuildRequires: ucd-snmp-devel >= 4.2.3}
+%{!?_without_snmp:BuildRequires: ucd-snmp-devel >= 4.2.6}
 %{!?_without_odbc:BuildRequires: unixODBC-devel}
-BuildRequires:	xmlrpc-epi-devel
-BuildRequires:	yaz-devel
+%{!?_without_xmlrpc:BuildRequires:	xmlrpc-epi-devel}
+BuildRequires:	yaz-devel >= 1.9
 BuildRequires:	zip
 BuildRequires:	zlib-devel >= 1.0.9
 BuildRequires:	zziplib-devel
 #BuildRequires:	fastcgi-devkit
 # apache 1.3 vs apache 2.0
 %if %{_apache2}
-PreReq:		apache >= 2.0.39
+PreReq:		apache >= 2.0.40
+%requires_eq	apache
 %else
 PreReq:		apache(EAPI) < 2.0.0
 PreReq:		apache(EAPI) >= 1.3.9
+Requires(post,preun):	%{apxs}
+Requires(post,preun):	perl
 %endif
-PreReq:		perl
-PreReq:		%{_sbindir}/apxs
 PreReq:		%{name}-common = %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	phpfi
@@ -230,7 +262,7 @@ PHP jako program CGI.
 
 %package common
 Summary:	Common files nneded by both apache module and CGI
-Summary(pl):	Wspólne pliki dla modu³u apacha i programu CGI
+Summary(pl):	Wspólne pliki dla modu³u apache'a i programu CGI
 Summary(ru):	òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ php
 Summary(uk):	â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ php
 Group:		Libraries
@@ -311,7 +343,8 @@ Manual da linguagem PHP, em formato HTML.
 Summary:	bcmath extension module for PHP
 Summary(pl):	Modu³ bcmath dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description bcmath
 This is a dynamic shared object (DSO) for Apache that will add bc
@@ -325,7 +358,8 @@ matematycznych takich jak w programie bc.
 Summary:	Bzip2 extension module for PHP
 Summary(pl):	Modu³ bzip2 dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description bzip2
 This is a dynamic shared object (DSO) for Apache that will add
@@ -338,7 +372,8 @@ Modu
 Summary:	Calendar extension module for PHP
 Summary(pl):	Modu³ funkcji kalendarza dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description calendar
 This is a dynamic shared object (DSO) for Apache that will add
@@ -352,7 +387,8 @@ wsparcie dla kalendarza.
 Summary:	cpdf extension module for PHP
 Summary(pl):	Modu³ cpdf dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description cpdf
 This is a dynamic shared object (DSO) for Apache that will add libcpdf
@@ -365,7 +401,8 @@ Modu
 Summary:	crack extension module for PHP
 Summary(pl):	Modu³ crack dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description crack
 This is a dynamic shared object (DSO) for Apache that will add
@@ -382,20 +419,22 @@ Uwaga: to jest modu
 Summary:	ctype extension module for PHP
 Summary(pl):	Modu³ ctype dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description ctype
 This is a dynamic shared object (DSO) for Apache that will add ctype
 support to PHP.
 
-%description crack -l pl
+%description ctype -l pl
 Modu³ PHP umo¿liwiaj±cy korzystanie z funkcji ctype.
 
 %package curl
 Summary:	curl extension module for PHP
 Summary(pl):	Modu³ curl dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description curl
 This is a dynamic shared object (DSO) for Apache that will add curl
@@ -408,7 +447,8 @@ Modu
 Summary:	DBA extension module for PHP
 Summary(pl):	Modu³ DBA dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description dba
 This is a dynamic shared object (DSO) for Apache that will add
@@ -422,7 +462,8 @@ wsparcie dla baz danych opartych na plikach (DBA).
 Summary:	DBase extension module for PHP
 Summary(pl):	Modu³ DBase dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description dbase
 This is a dynamic shared object (DSO) for Apache that will add DBase
@@ -435,7 +476,8 @@ Modu
 Summary:	DBX extension module for PHP
 Summary(pl):	Modu³ DBX dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description dbx
 This is a dynamic shared object (DSO) for Apache that will add DB
@@ -451,7 +493,8 @@ mysql, pgsql, mssql, fbsql i inne.
 Summary:	Direct I/O extension module for PHP
 Summary(pl):	Modu³ Direct I/O dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description dio
 This is a dynamic shared object (DSO) for Apache that will add direct
@@ -469,6 +512,8 @@ Uwaga: to jest modu
 Summary:	DOM XML extension module for PHP
 Summary(pl):	Modu³ DOM XML dla PHP
 Group:		Libraries
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description domxml
 This is a dynamic shared object (DSO) for Apache that will add DOM XML
@@ -485,7 +530,8 @@ Uwaga: to jest modu
 Summary:	exif extension module for PHP
 Summary(pl):	Modu³ exif dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description exif
 This is a dynamic shared object (DSO) for Apache that will add exif
@@ -498,7 +544,8 @@ Modu
 Summary:	filePro extension module for PHP
 Summary(pl):	Modu³ filePro dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description filepro
 This is a dynamic shared object (DSO) for Apache that will add PHP
@@ -512,7 +559,8 @@ mo
 Summary:	FTP extension module for PHP
 Summary(pl):	Modu³ FTP dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description ftp
 This is a dynamic shared object (DSO) for Apache that will add FTP
@@ -523,9 +571,12 @@ Modu
 
 %package gd
 Summary:	GD extension module for PHP
-Summary:	Modu³ GD dla PHP
+Summary(pl):	Modu³ GD dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
+%{!?_without_gif:Requires:	gd(gif)}
+%{!?_without_gif:Provides:	%{name}-gd(gif) = %{epoch}:%{version}-%{release}}
 
 %description gd
 This is a dynamic shared object (DSO) for Apache that will add GD
@@ -541,7 +592,8 @@ obrazk
 Summary:	gettext extension module for PHP
 Summary(pl):	Modu³ gettext dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description gettext
 This is a dynamic shared object (DSO) for Apache that will add gettext
@@ -554,7 +606,8 @@ Modu
 Summary:	gmp extension module for PHP
 Summary(pl):	Modu³ gmp dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description gmp
 This is a dynamic shared object (DSO) for Apache that will add
@@ -567,7 +620,8 @@ Modu
 Summary:	Hyperwave extension module for PHP
 Summary(pl):	Modu³ Hyperwave dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description hyperwave
 This is a dynamic shared object (DSO) for Apache that will add
@@ -580,7 +634,8 @@ Modu
 Summary:	iconv extension module for PHP
 Summary(pl):	Modu³ iconv dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description iconv
 This is a dynamic shared object (DSO) for Apache that will add iconv
@@ -594,7 +649,8 @@ Summary:	IMAP extension module for PHP
 Summary(pl):	Modu³ IMAP dla PHP
 Summary(pt_BR):	Um módulo para aplicações PHP que usam IMAP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description imap
 This is a dynamic shared object (DSO) for Apache that will add IMAP
@@ -607,26 +663,26 @@ Modu
 Um módulo para aplicações PHP que usam IMAP.
 
 %package interbase
-Summary:	Interbase database module for PHP
-Summary(pl):	Modu³ bazy danych Interbase dla PHP
+Summary:	InterBase/Firebird database module for PHP
+Summary(pl):	Modu³ bazy danych InterBase/Firebird dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
-Autoreq:	false
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
+%{?_with_interbase_inst:Autoreq:	false}
 
 %description interbase
 This is a dynamic shared object (DSO) for Apache that will add
-InterBase database support to PHP. If you need back-end support for
-InterBase, you should install this package in addition to the main
-%{name} package.
+InterBase and Firebird database support to PHP.
 
 %description interbase -l pl
-Modu³ PHP umo¿liwiaj±cy dostêp do bazy danych InterBase.
+Modu³ PHP umo¿liwiaj±cy dostêp do baz danych InterBase i Firebird.
 
 %package java
 Summary:	Java extension module for PHP
 Summary(pl):	Modu³ Javy dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description java
 This is a dynamic shared object (DSO) for Apache that will add JAVA
@@ -642,7 +698,8 @@ Summary:	LDAP extension module for PHP
 Summary(pl):	Modu³ LDAP dla PHP
 Summary(pt_BR):	Um módulo para aplicações PHP que usam LDAP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description ldap
 This is a dynamic shared object (DSO) for Apache that will add LDAP
@@ -653,11 +710,13 @@ Modu
 
 %description ldap -l pt_BR
 Um módulo para aplicações PHP que usam LDAP.
+
 %package mbstring
 Summary:	mbstring extension module for PHP
 Summary(pl):	Modu³ mbstring dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description mbstring
 This is a dynamic shared object (DSO) for Apache that will add
@@ -670,7 +729,8 @@ Modu
 Summary:	mcal extension module for PHP
 Summary(pl):	Modu³ mcal dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description mcal
 This is a dynamic shared object (DSO) for Apache that will add mcal
@@ -684,7 +744,8 @@ do kalendarzy).
 Summary:	mcrypt extension module for PHP
 Summary(pl):	Modu³ mcrypt dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description mcrypt
 This is a dynamic shared object (DSO) for Apache that will add mcrypt
@@ -697,7 +758,8 @@ Modu
 Summary:	mhash extension module for PHP
 Summary(pl):	Modu³ mhash dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description mhash
 This is a dynamic shared object (DSO) for Apache that will add mhash
@@ -710,7 +772,8 @@ Modu
 Summary:	ming extension module for PHP
 Summary(pl):	Modu³ ming dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description ming
 This is a dynamic shared object (DSO) for Apache that will add ming
@@ -724,7 +787,8 @@ ming.
 Summary:	mnoGoSearch extension module for PHP
 Summary(pl):	Modu³ mnoGoSearch dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description mnogosearch
 This is a dynamic shared object (DSO) for Apache that will allow you
@@ -738,7 +802,8 @@ wyszukiwarki mnoGoSearch.
 Summary:	msession extension module for PHP
 Summary(pl):	Modu³ msession dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description msession
 This is a dynamic shared object (DSO) for Apache that will allow you
@@ -757,7 +822,8 @@ Summary:	MySQL database module for PHP
 Summary(pl):	Modu³ bazy danych MySQL dla PHP
 Summary(pt_BR):	Um módulo para aplicações PHP que usam bancos de dados MySQL
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description mysql
 This is a dynamic shared object (DSO) for Apache that will add MySQL
@@ -774,7 +840,8 @@ Um m
 Summary:	Oracle 8 database module for PHP
 Summary(pl):	Modu³ bazy danych Oracle 8 dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 Autoreq:	false
 
 %description oci8
@@ -791,7 +858,8 @@ Summary:	ODBC extension module for PHP
 Summary(pl):	Modu³ ODBC dla PHP
 Summary(pt_BR):	Um módulo para aplicações PHP que usam bases de dados ODBC
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 Requires:	unixODBC >= 2.1.1-3
 
 %description odbc
@@ -808,7 +876,8 @@ Um m
 Summary:	OpenSSL extension module for PHP
 Summary(pl):	Modu³ OpenSSL dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description openssl
 This is a dynamic shared object (DSO) for Apache that will add OpenSSL
@@ -825,7 +894,8 @@ Uwaga: to jest modu
 Summary:	Oracle 7 database module for PHP
 Summary(pl):	Modu³ bazy danych Oracle 7 dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 Autoreq:	false
 
 %description oracle
@@ -839,7 +909,8 @@ Modu
 Summary:	Overload extension module for PHP
 Summary(pl):	Modu³ Overload dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description overload
 This is a dynamic shared object (DSO) for Apache that will add
@@ -856,7 +927,8 @@ Uwaga: to jest modu
 Summary:	Process Control extension module for PHP
 Summary(pl):	Modu³ Process Control dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-cgi = %{version}
+Requires:	%{name}-cgi = %{version}
 
 %description pcntl
 This is a dynamic shared object (DSO) for Apache that will add process
@@ -877,7 +949,8 @@ u
 Summary:	PCRE extension module for PHP
 Summary(pl):	Modu³ PCRE dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description pcre
 This is a dynamic shared object (DSO) for Apache that will add Perl
@@ -891,8 +964,9 @@ Modu
 Summary:	libPDF module for PHP
 Summary(pl):	Modu³ do tworzenia plików PDF dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
 PreReq:		pdflib
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description pdf
 This is a dynamic shared object (DSO) for Apache that will add PDF
@@ -902,59 +976,12 @@ support to PHP.
 Modu³ PHP umo¿liwiaj±cy tworzenie plików PDF. Wykorzystuje bibliotekê
 pdflib.
 
-%package pear
-Summary:	PEAR - PHP Extension and Application Repository
-Summary(pl):	PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
-Group:		Development/Languages/PHP
-Requires:	%{name}-pcre = %{version}
-Requires:	%{name}-xml = %{version}
-
-%description pear
-PEAR - PHP Extension and Application Repository.
-
-%description pear -l pl
-PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
-Repozytorium Aplikacji.
-
-%package pear-additional_classes
-Summary:	PEAR - PHP Extension and Application Repository
-Summary(pl):	PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
-Group:		Development/Languages/PHP
-Requires:	%{name}-pcre = %{version}
-Requires:	%{name}-pear
-
-%description pear-additional_classes
-PEAR - PHP Extension and Application Repository. Additional classes
-which can't be found in pear packages.
-
-%description pear-additional_classes -l pl
-PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
-Repozytorium Aplikacji. Dodatkowe klasy, których nie ma w innych
-pakietach peara.
-
-%package pear-devel
-Summary:	PEAR - PHP Extension and Application Repository
-Summary(pl):	PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
-Group:		Development/Languages/PHP
-Requires:	%{name}-cgi = %{version}
-Requires:	%{name}-pcre = %{version}
-Requires:	%{name}-xml = %{version}
-Requires:	%{name}-pear
-Requires:	%{name}-pear-PEAR-Command
-
-%description pear-devel
-PEAR - PHP Extension and Application Repository. This package contains
-aplications needed to use pear from cvs.
-
-%description pear-devel -l pl
-PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
-Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
-
 %package pgsql
 Summary:	PostgreSQL database module for PHP
 Summary(pl):	Modu³ bazy danych PostgreSQL dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description pgsql
 This is a dynamic shared object (DSO) for Apache that will add
@@ -972,7 +999,8 @@ Um m
 Summary:	POSIX extension module for PHP
 Summary(pl):	Modu³ POSIX dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description posix
 This is a dynamic shared object (DSO) for Apache that will add POSIX
@@ -985,7 +1013,8 @@ Modu
 Summary:	pspell extension module for PHP
 Summary(pl):	Modu³ pspell dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description pspell
 This is a dynamic shared object (DSO) for Apache that will add pspell
@@ -1000,7 +1029,8 @@ sprawdzanie pisowni s
 Summary:	recode extension module for PHP
 Summary(pl):	Modu³ recode dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 Requires:	recode >= 3.5d-3
 
 %description recode
@@ -1015,7 +1045,8 @@ bibliotek
 Summary:	session extension module for PHP
 Summary(pl):	Modu³ session dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description session
 This is a dynamic shared object (DSO) for Apache that will add session
@@ -1028,7 +1059,8 @@ Modu
 Summary:	Shared Memory Operations extension module for PHP
 Summary(pl):	Modu³ shmop dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description shmop
 This is a dynamic shared object (DSO) for Apache that will add Shared
@@ -1045,7 +1077,8 @@ Uwaga: to jest modu
 Summary:	SNMP extension module for PHP
 Summary(pl):	Modu³ SNMP dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description snmp
 This is a dynamic shared object (DSO) for Apache that will add SNMP
@@ -1058,7 +1091,8 @@ Modu
 Summary:	sockets extension module for PHP
 Summary(pl):	Modu³ socket dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description sockets
 This is a dynamic shared object (DSO) for Apache that will add sockets
@@ -1075,7 +1109,8 @@ Uwaga: to jest modu
 Summary:	Sybase-CT extension module for PHP
 Summary(pl):	Modu³ Sybase-CT dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description sybase-ct
 This is a dynamic shared object (DSO) for Apache that will add Sybase
@@ -1089,7 +1124,8 @@ CT-lib.
 Summary:	SysV sem extension module for PHP
 Summary(pl):	Modu³ SysV sem dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description sysvsem
 This is a dynamic shared object (DSO) for Apache that will add SysV
@@ -1102,7 +1138,8 @@ Modu
 Summary:	SysV shm extension module for PHP
 Summary(pl):	Modu³ SysV shm dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description sysvshm
 This is a dynamic shared object (DSO) for Apache that will add SysV
@@ -1115,8 +1152,9 @@ Modu
 Summary:	wddx extension module for PHP
 Summary(pl):	Modu³ wddx dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
 PreReq:		%{name}-session = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description wddx
 This is a dynamic shared object (DSO) for Apache that will add wddx
@@ -1129,7 +1167,8 @@ Modu
 Summary:	XML extension module for PHP
 Summary(pl):	Modu³ XML dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description xml
 This is a dynamic shared object (DSO) for Apache that will add XML
@@ -1146,7 +1185,8 @@ zwi
 Summary:	xmlrpc extension module for PHP
 Summary(pl):	Modu³ xmlrpc dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description xmlrpc
 This is a dynamic shared object (DSO) for Apache that will add XMLRPC
@@ -1163,7 +1203,8 @@ Uwaga: to jest modu
 Summary:	xslt extension module for PHP
 Summary(pl):	Modu³ xslt dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description xslt
 This is a dynamic shared object (DSO) for Apache that will add xslt
@@ -1176,7 +1217,9 @@ Modu
 Summary:	yaz extension module for PHP
 Summary(pl):	Modu³ yaz dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
+Requires:	yaz >= 1.9
 
 %description yaz
 This is a dynamic shared object (DSO) for Apache that will add yaz
@@ -1191,7 +1234,8 @@ Z39.50 s
 Summary:	NIS (yp) extension module for PHP
 Summary(pl):	Modu³ NIS (yp) dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description yp
 This is a dynamic shared object (DSO) for Apache that will add NIS
@@ -1205,7 +1249,8 @@ wsparcie dla NIS (Yellow Pages).
 Summary:	zip extension module for PHP
 Summary(pl):	Modu³ zip dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description zip
 This is a dynamic shared object (DSO) for Apache that will add ZZipLib
@@ -1219,7 +1264,8 @@ Modu
 Summary:	Zlib extension module for PHP
 Summary(pl):	Modu³ zlib dla PHP
 Group:		Libraries
-PreReq:		%{name}-common = %{version}
+Requires(post,preun):%{name}-common = %{version}
+Requires:	%{name}-common = %{version}
 
 %description zlib
 This is a dynamic shared object (DSO) for Apache that will add
@@ -1228,57 +1274,115 @@ compression (zlib) support to PHP.
 %description zlib -l pl
 Modu³ PHP umo¿liwiaj±cy u¿ywanie kompresji (poprzez bibliotekê zlib).
 
+%package pear
+Summary:	PEAR - PHP Extension and Application Repository
+Summary(pl):	PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
+Group:		Development/Languages/PHP
+Requires:	%{name}-pcre = %{version}
+Requires:	%{name}-xml = %{version}
+
+%description pear
+PEAR - PHP Extension and Application Repository.
+
+%description pear -l pl
+PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
+Repozytorium Aplikacji.
+
+%package pear-additional_classes
+Summary:	PEAR - PHP Extension and Application Repository
+Summary(pl):	PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
+Group:		Development/Languages/PHP
+Requires:	%{name}-pcre = %{version}
+Requires:	%{name}-pear
+
+%description pear-additional_classes
+PEAR - PHP Extension and Application Repository. Additional classes
+which can't be found in pear packages.
+
+%description pear-additional_classes -l pl
+PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
+Repozytorium Aplikacji. Dodatkowe klasy, których nie ma w innych
+pakietach peara.
+
+%package pear-devel
+Summary:	PEAR - PHP Extension and Application Repository
+Summary(pl):	PEAR - Rozszerzenie PHP i Repozytorium Aplikacji
+Group:		Development/Languages/PHP
+Requires:	%{name}-cgi = %{version}
+Requires:	%{name}-pcre = %{version}
+Requires:	%{name}-xml = %{version}
+Requires:	%{name}-pear
+Requires:	%{name}-pear-PEAR-Command
+
+%description pear-devel
+PEAR - PHP Extension and Application Repository. This package contains
+aplications needed to use pear from cvs.
+
+%description pear-devel -l pl
+PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i
+Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+#%patch2 -p1	-- obsolete
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1	-- obsolete (fastcgi interface changed)
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
+#%patch9 -p1	-- obsolete
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
+#%patch11 -p1	-- obsolete (openssl used also in common part)
+#%patch12 -p1	-- needs update? to check
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
+#%patch16 -p1	-- uhm... php allows _separate_ (not included) php-${SAPI}.ini files now
+#%patch17 -p1	-- obsolete
+#%patch18 -p1	-- obsolete? - no such file
+#%patch19 -p1	-- obsolete
+cp php.ini-dist php.ini
 %patch20 -p1
+# for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
+# conditionally...
+%patch21 -p1
+%patch22 -p1
+#%patch23 -p1	-- obsolete
+%patch24 -p1
 
 install -d manual
-bzip2 -dc %{SOURCE4} | tar -xf - -C manual
+bzip2 -dc %{SOURCE3} | tar -xf - -C manual
 
 %build
-CFLAGS="%{rpmcflags} -DEAPI=1 -I%{_prefix}/X11R6/include"
+CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
 EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR
 ./buildconf
 %{__libtoolize}
-aclocal
+%{__aclocal}
 autoconf
-#for i in cgi fastcgi apxs ; do
+#for i in cgi cli fastcgi apxs ; do
 PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL
 for i in cgi apxs ; do
 %configure \
 	`[ $i = cgi ] && echo --enable-discard-path` \
-	`[ $i = fastcgi ] && echo --enable-discard-path --with-fastcgi=%{_prefix}` \
+	`[ $i != cli ] && echo --disable-cli` \
+	`[ $i = cli ] && echo --disable-cgi` \
+	`[ $i = fastcgi ] && --enable-fastcgi --with-fastcgi=/usr` \
 %if %{_apache2}
-	`[ $i = apxs ] && echo --with-apxs2=%{_sbindir}/apxs` \
+	`[ $i = apxs ] && echo --with-apxs2=%{apxs}` \
 %else
-	`[ $i = apxs ] && echo --with-apxs=%{_sbindir}/apxs` \
+	`[ $i = apxs ] && echo --with-apxs=%{apxs}` \
 %endif
 	--with-config-file-path=%{_sysconfdir} \
 	--with-exec-dir=%{_bindir} \
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	--enable-bcmath=shared \
 	--enable-calendar=shared \
-	--disable-cli \
 	--enable-ctype=shared \
 	--enable-dba=shared \
 	--enable-dbx=shared \
@@ -1289,7 +1393,7 @@ for i in cgi apxs ; do
 	--enable-magic-quotes \
 	--enable-mbstring=shared --disable-mbstr-enc-trans --enable-mbregex \
 	--enable-overload=shared \
-	--disable-pcntl \
+	%{?_with_pcntl:--enable-pcntl=shared}%{!?_with_pcntl:--disable-pcntl} \
 	--enable-posix=shared \
 	--enable-session \
 	--enable-shared \
@@ -1302,88 +1406,99 @@ for i in cgi apxs ; do
 	--enable-sockets=shared \
 	--enable-ucd-snmp-hack \
 	%{!?_without_wddx:--enable-wddx=shared} \
-	--enable-xml=shared \
+	%{?_without_xml:--disable-xml}%{!?_without_xml:--enable-xml=shared} \
 	%{!?_without_xslt:--enable-xslt=shared} \
 	--enable-yp=shared \
 	--with-bz2=shared \
-	%{?_with_cpdf:--with-cpdflib=shared} \
+	%{!?_without_cpdf:--with-cpdflib=shared} \
 	--with-crack=shared \
-	--with-curl=shared \
-	--without-db2 \
-	--with-db3 \
+	%{?_without_curl:--without-curl}%{!?_without_curl:--with-curl=shared} \
+	%{?_with_db3:--with-db3}%{!?_with_db3:--with-db4} \
 	--with-dbase=shared \
 	--with-dom=shared \
-	%{!?_without_libxslt:--with-dom-xslt=shared --with-dom-exslt=shared} \
+	%{!?_without_domxslt:--with-dom-xslt=shared --with-dom-exslt=shared} \
+%if %(expr %{?_without_xml:0}%{!?_without_xml:1} + %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1})
 	--with-expat-dir=shared,/usr \
+%else
+	--without-expat-dir \
+%endif
 	--with-iconv=shared \
 	--with-filepro=shared \
 	--with-freetype-dir=shared \
 	--with-gettext=shared \
-	--with-gd=shared \
+	--with-gd=shared,/usr \
 	--with-gdbm \
 	--with-gmp=shared \
 	--with-hyperwave=shared \
 	%{!?_without_imap:--with-imap=shared --with-imap-ssl} \
-	%{?_with_interbase:--with-interbase=shared} \
-	%{?_with_java:--with-java} \
+	%{!?_without_interbase:--with-interbase=shared%{!?_with_interbase_inst:,/usr}} \
+	%{?_with_java:--with-java=/usr/lib/java} \
 	--with-jpeg-dir=shared,/usr \
 	%{!?_without_ldap:--with-ldap=shared} \
 	--with-mcal=shared,/usr \
 	--with-mcrypt=shared \
-	--with-mhash=shared \
-	--with-ming=shared \
+	%{!?_without_mhash:--with-mhash=shared} \
+	%{!?_without_ming:--with-ming=shared} \
 	%{!?_without_mm:--with-mm} \
-	--with-mnogosearch=shared,/usr \
-	%{!?_without_msession:--with-msession=shared} \
+	%{?_without_mnogosearch:--without-mnogosearch}%{!?_without_mnogosearch:--with-mnogosearch=shared,/usr} \
+	%{!?_without_msession:--with-msession=shared}%{?_without_msession:--without-msession} \
 	--with-mysql=shared,/usr \
 	--with-mysql-sock=/var/lib/mysql/mysql.sock \
 	%{?_with_oci8:--with-oci8=shared} \
 	%{!?_without_openssl:--with-openssl=shared} \
 	%{?_with_oracle:--with-oracle=shared} \
-	--with-pcre-regex=shared \
-	--with-pdflib=shared \
+	%{?_without_pcre:--without-pcre-regex}%{!?_without_pcre:--with-pcre-regex=shared} \
+	%{!?_without_pdf:--with-pdflib=shared} \
 	--with-pear=%{php_pear_dir} \
-	--with-pgsql=shared,/usr \
+	%{?_without_pgsql:--without-pgsql}%{!?_without_pgsql:--with-pgsql=shared,/usr} \
 	--with-png-dir=shared,/usr \
-	--with-pspell=shared \
+	%{!?_without_pspell:--with-pspell=shared} \
 	%{!?_without_recode:--with-recode=shared} \
 	--with-regex=php \
-	--with-sablot-js=shared,no \
+	--without-sablot-js \
 	%{!?_without_snmp:--with-snmp=shared} \
-	%{?_with_sybase_ct:--with-sybase-ct=shared,/usr} \
+	%{!?_without_sybase_ct:--with-sybase-ct=shared,/usr} \
 	--with-t1lib=shared \
 	--with-tiff-dir=shared,/usr \
 	%{!?_without_odbc:--with-unixODBC=shared} \
-	--with-xmlrpc=shared,/usr \
+	%{?_without_xmlrpc:--without-xmlrpc}%{!?_without_xmlrpc:--with-xmlrpc=shared,/usr} \
 	%{!?_without_xslt:--with-xslt-sablot=shared} \
 	--with-yaz=shared \
 	--with-zip=shared \
 	--with-zlib=shared \
-	--with-zlib-dir=shared
+	--with-zlib-dir=shared,/usr
+
+cp -f Makefile Makefile.$i
 done
 
+#	--with-sablot-js=shared,no
+
 # for now session_mm doesn't work with shared session module...
 # --enable-session=shared
 # %{?_without_mm:--with-mm=shared,no}%{!?_without_mm:--with-mm=shared}
 
-# TODO --with-pspell=/usr,shared (pspell missing)
+# TODO:
 #	--with-qtdom=shared
 
 %{__make}
-%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" -C sapi/cgi
+
+cp -f Makefile.cgi Makefile
+#%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" -C sapi/cgi
+%{__make} sapi/cgi/php
+cp -f Makefile.apxs Makefile
 
 # Kill -rpath from php binary and libphp4.so
-perl -pi -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-perl -pi -e 's|^runpath_var=.*|runpath_var=|g' libtool
-%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" php
+#perl -pi -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+#perl -pi -e 's|^runpath_var=.*|runpath_var=|g' libtool
+#%{__make} CFLAGS="%{rpmcflags} -DDISCARD_PATH=1" php
 
-perl -pi -e 's|^hardcode_into_libs=.*|hardcode_into_libs=no|g' libtool
-rm libphp4.la ; %{__make} libphp4.la
+#perl -pi -e 's|^hardcode_into_libs=.*|hardcode_into_libs=no|g' libtool
+#rm libphp4.la ; %{__make} libphp4.la
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache},%{_sysconfdir}/{apache,cgi}} \
-	$RPM_BUILD_ROOT/home/httpd/icons \
+	$RPM_BUILD_ROOT/home/services/httpd/icons \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
 	$RPM_BUILD_ROOT/var/run/php \
 	$RPM_BUILD_ROOT/etc/httpd/httpd.conf
@@ -1394,19 +1509,20 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache},%{_sysconfdir}/{apache,cgi}}
 
 %{?_with_java:install ext/java/php_java.jar $RPM_BUILD_ROOT%{_libdir}}
 
-install .libs/php $RPM_BUILD_ROOT%{_bindir}/php
+#install .libs/php $RPM_BUILD_ROOT%{_bindir}/php
+install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php
 
-install %{SOURCE2}		$RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-install %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE3} php.gif $RPM_BUILD_ROOT/home/httpd/icons
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sbindir}
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php.conf
+install php.ini	$RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+install %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}
+install %{SOURCE2} php.gif $RPM_BUILD_ROOT/home/services/httpd/icons
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php.conf
 
 install %{SOURCE1} .
 
 mv -f Zend/LICENSE{,.Zend}
 
-mkdir $RPM_BUILD_ROOT%{php_pear_dir}/{Auth,Auth_HTTP}
+install -d $RPM_BUILD_ROOT%{php_pear_dir}/{Auth,Science,HTML/Template}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1415,7 +1531,7 @@ rm -rf $RPM_BUILD_ROOT
 %if ! %{_apache2}
 perl -pi -e 's|^#AddType application/x-httpd-php \.php|AddType application/x-httpd-php .php|' \
 	/etc/httpd/httpd.conf
-%{_sbindir}/apxs -e -a -n php4 %{_pkglibdir}/libphp4.so 1>&2
+%{apxs} -e -a -n php4 %{_pkglibdir}/libphp4.so 1>&2
 %endif
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
@@ -1431,7 +1547,7 @@ fi
 %else
 %preun
 if [ "$1" = "0" ]; then
-	%{_sbindir}/apxs -e -A -n php4 %{_pkglibdir}/libphp4.so 1>&2
+	%{apxs} -e -A -n php4 %{_pkglibdir}/libphp4.so 1>&2
 	perl -pi -e \
 		's|^AddType application/x-httpd-php \.php|#AddType application/x-httpd-php .php|' \
 		/etc/httpd/httpd.conf
@@ -1741,11 +1857,11 @@ if [ "$1" = "0" ]; then
 fi
 
 %post pcntl
-%{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php.ini
+%{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php-cgi.ini
 
 %preun pcntl
 if [ "$1" = "0" ]; then
-	%{_sbindir}/php-module-install remove pcntl %{_sysconfdir}/php.ini
+	%{_sbindir}/php-module-install remove pcntl %{_sysconfdir}/php-cgi.ini
 fi
 
 %post pcre
@@ -1931,6 +2047,7 @@ fi
 
 %files common
 %defattr(644,root,root,755)
+%doc php.ini-*
 %doc CODING_STANDARDS CREDITS Zend/ZEND_CHANGES
 %doc LICENSE Zend/LICENSE.Zend EXTENSIONS NEWS TODO*
 %doc README.EXT_SKEL README.SELF-CONTAINED-EXTENSIONS
@@ -1939,7 +2056,7 @@ fi
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.ini
 %attr(730,root,http) %dir %verify(not group mode) /var/run/php
 
-/home/httpd/icons/*
+/home/services/httpd/icons/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/libphp_common*.so.*.*.*
 %dir %{extensionsdir}
@@ -1968,7 +2085,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/calendar.so
 
-%if %{?_with_cpdf:1}%{!?_with_cpdf:0}
+%if %{?_without_cpdf:0}%{!?_without_cpdf:1}
 %files cpdf
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/cpdf.so
@@ -1982,9 +2099,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/ctype.so
 
+%if %{!?_without_curl:1}%{?_without_curl:0}
 %files curl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/curl.so
+%endif
 
 %files dba
 %defattr(644,root,root,755)
@@ -2044,7 +2163,7 @@ fi
 %attr(755,root,root) %{extensionsdir}/imap.so
 %endif
 
-%if %{?_with_interbase:1}%{!?_with_interbase:0}
+%if %{?_without_interbase:0}%{!?_without_interbase:1}
 %files interbase
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/interbase.so
@@ -2075,17 +2194,23 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/mcrypt.so
 
+%if %{!?_without_mhash:1}%{?_without_mhash:0}
 %files mhash
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/mhash.so
+%endif
 
+%if %{!?_without_ming:1}%{?_without_ming:0}
 %files ming
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/ming.so
+%endif
 
+%if %{!?_without_mnogosearch:1}%{?_without_mnogosearch:0}
 %files mnogosearch
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/mnogosearch.so
+%endif
 
 %if %{?_without_msession:0}%{!?_without_msession:1}
 %files msession
@@ -2109,7 +2234,7 @@ fi
 %attr(755,root,root) %{extensionsdir}/odbc.so
 %endif
 
-%if %{?_without_openssl:0}%{!?_without_odbc:1}
+%if %{?_without_openssl:0}%{!?_without_openssl:1}
 %files openssl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/openssl.so
@@ -2125,71 +2250,39 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/overload.so
 
-# disabled in 4.2.0 - it segfaults
-#%files pcntl
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{extensionsdir}/pcntl.so
+%if %{?_with_pcntl:1}%{!?_with_pcntl:0}
+%files pcntl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{extensionsdir}/pcntl.so
+%endif
 
+%if %{?_without_pcre:0}%{!?_without_pcre:1}
 %files pcre
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pcre.so
+%endif
 
-%files pear
-%defattr(644,root,root,755)
-%dir %{php_pear_dir}
-%dir %{php_pear_dir}/Archive
-%dir %{php_pear_dir}/Auth
-%dir %{php_pear_dir}/Auth_HTTP
-%dir %{php_pear_dir}/Console
-%dir %{php_pear_dir}/Crypt
-%dir %{php_pear_dir}/Date
-%dir %{php_pear_dir}/DB
-%dir %{php_pear_dir}/File
-%dir %{php_pear_dir}/HTML
-%dir %{php_pear_dir}/HTTP
-%dir %{php_pear_dir}/Image
-%dir %{php_pear_dir}/Mail
-%dir %{php_pear_dir}/Net
-%dir %{php_pear_dir}/PEAR
-%dir %{php_pear_dir}/Schedule
-%dir %{php_pear_dir}/XML
-
-%files pear-additional_classes
-%defattr(644,root,root,755)
-%doc pear/HTML/IT*.php
-%attr(644,root,root) %{php_pear_dir}/Crypt/HCEMD5.php
-%attr(644,root,root) %{php_pear_dir}/Date/Calc.php
-%attr(644,root,root) %{php_pear_dir}/Date/Human.php
-%attr(644,root,root) %{php_pear_dir}/File/Passwd.php
-%attr(644,root,root) %{php_pear_dir}/HTML/Form.php
-%attr(644,root,root) %{php_pear_dir}/HTML/Page.php
-%attr(644,root,root) %{php_pear_dir}/HTML/Processor.php
-%attr(644,root,root) %{php_pear_dir}/HTML/Select.php
-%attr(644,root,root) %{php_pear_dir}/HTTP/Compress.php
-%attr(644,root,root) %{php_pear_dir}/Net/SMTP.php
-%attr(644,root,root) %{php_pear_dir}/Schedule/At.php
-
-%files pear-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pear
-%attr(755,root,root) %{_bindir}/pearize
-%attr(755,root,root) %{_bindir}/phptar
-
+%if %{?_without_pdf:0}%{!?_without_pdf:1}
 %files pdf
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pdf.so
+%endif
 
+%if %{!?_without_pgsql:1}%{?_without_pgsql:0}
 %files pgsql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pgsql.so
+%endif
 
 %files posix
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/posix.so
 
+%if %{!?_without_pspell:1}%{?_without_pspell:0}
 %files pspell
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/pspell.so
+%endif
 
 %if %{?_without_recode:0}%{!?_without_recode:1}
 %files recode
@@ -2216,7 +2309,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/sockets.so
 
-%if %{?_with_sybase_ct:1}%{!?_with_sybase_ct:0}
+%if %{?_without_sybase_ct:0}%{!?_without_sybase_ct:1}
 %files sybase-ct
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/sybase_ct.so
@@ -2236,13 +2329,17 @@ fi
 %attr(755,root,root) %{extensionsdir}/wddx.so
 %endif
 
+%if %{?_without_xml:0}%{!?_without_xml:1}
 %files xml
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/xml.so
+%endif
 
+%if %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1}
 %files xmlrpc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/xmlrpc.so
+%endif
 
 %if %{?_without_xslt:0}%{!?_without_xslt:1}
 %files xslt
@@ -2265,3 +2362,43 @@ fi
 %files zlib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{extensionsdir}/zlib.so
+
+%files pear
+%defattr(644,root,root,755)
+%dir %{php_pear_dir}
+%dir %{php_pear_dir}/Archive
+%dir %{php_pear_dir}/Auth
+%dir %{php_pear_dir}/Console
+%dir %{php_pear_dir}/Crypt
+%dir %{php_pear_dir}/Date
+%dir %{php_pear_dir}/DB
+%dir %{php_pear_dir}/File
+%dir %{php_pear_dir}/HTML
+%dir %{php_pear_dir}/HTML/Template
+%dir %{php_pear_dir}/HTTP
+%dir %{php_pear_dir}/Image
+%dir %{php_pear_dir}/Mail
+%dir %{php_pear_dir}/Net
+%dir %{php_pear_dir}/PEAR
+%dir %{php_pear_dir}/Schedule
+%dir %{php_pear_dir}/Science
+%dir %{php_pear_dir}/XML
+
+%files pear-additional_classes
+%defattr(644,root,root,755)
+%attr(644,root,root) %{php_pear_dir}/Crypt/HCEMD5.php
+%attr(644,root,root) %{php_pear_dir}/File/Passwd.php
+%attr(644,root,root) %{php_pear_dir}/HTML/Form.php
+%attr(644,root,root) %{php_pear_dir}/HTML/IT*.php
+%attr(644,root,root) %{php_pear_dir}/HTML/Page.php
+%attr(644,root,root) %{php_pear_dir}/HTML/Processor.php
+%attr(644,root,root) %{php_pear_dir}/HTML/Select.php
+%attr(644,root,root) %{php_pear_dir}/HTTP/Compress.php
+%attr(644,root,root) %{php_pear_dir}/Schedule/At.php
+
+%files pear-devel
+%defattr(644,root,root,755)
+# in proper class now
+#%attr(755,root,root) %{_bindir}/pear
+%attr(755,root,root) %{_bindir}/pearize
+%attr(755,root,root) %{_bindir}/phptar