SPECS: php.spec moved from DEVEL

arekm arekm at pld-linux.org
Thu Dec 15 14:20:09 CET 2005


Author: arekm                        Date: Thu Dec 15 13:20:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
moved from DEVEL

---- Files affected:
SPECS:
   php.spec (1.515 -> 1.516) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.515 SPECS/php.spec:1.516
--- SPECS/php.spec:1.515	Tue Dec 13 16:59:58 2005
+++ SPECS/php.spec	Thu Dec 15 14:20:03 2005
@@ -5,7 +5,6 @@
 #    - mcve,
 #    - ovrimos,
 #    - pfpro,
-#    - ircg,
 #   These extensions BuildRequires proprietary libraries...
 # - deal with modules removed from php and not moved to PECL
 #   (existing only in php4):
@@ -13,7 +12,8 @@
 # - mime_magic can't handle new "string/*" entries in magic.mime
 # - make additional headers added by mail patch configurable
 # - apply -hardened patch by default ?
-# - modularize libxml, session, SimpleXML, SPL, standard (output from pure php -m)?
+# - modularize session, standard (output from pure php -m)?
+# - having pcre module loaded cli crashes
 #
 # Conditional build:
 %bcond_with	db3		# use db3 packages instead of db (4.x) for Berkeley DB support
@@ -24,16 +24,13 @@
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
 %bcond_with	oracle		# with oracle extension module		(BR: proprietary libs)
 %bcond_without	mysqli		# with mysqli support (Requires mysql > 4.1)
-%bcond_without	cpdf		# without cpdf extension module
 %bcond_without	curl		# without CURL extension module
-%bcond_without	fam		# without FAM (File Alteration Monitor) extension module
 %bcond_without	imap		# without IMAP extension module
-%bcond_without	interbase	# without InterBase extension module
+%bcond_with	interbase	# with InterBase extension module
 %bcond_without	ldap		# without LDAP extension module
 %bcond_without	mhash		# without mhash extension module
 %bcond_without	ming		# without ming extension module
 %bcond_without	mm		# without mm support for session storage
-%bcond_without	mnogosearch	# without mnogosearch extension module
 %bcond_without	msession	# without msession extension module
 %bcond_without	mssql		# without MS SQL extension module
 %bcond_without	mime_magic		# without mime-magic module
@@ -83,14 +80,13 @@
 Summary(ru):	PHP ÷ĹŇÓÉÉ 5 - ŃÚŮË ĐŇĹĐŇĎĂĹÓÓÉŇĎ×ÁÎÉŃ HTML-ĆÁĘĚĎ×, ×ŮĐĎĚÎŃĹÍŮĘ ÎÁ ÓĹŇ×ĹŇĹ
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
-Version:	5.0.5
-%define	_rel	19
-Release:	%{_rel}%{?with_hardening:hardened}
+Version:	5.1.1
+Release:	0.1%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
 License:	PHP
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	b5d4ca75bbb11ee5b830fa67213d9f7f
+# Source0-md5:	70a7c90de182d1a1901c390b844153c7
 Source1:	FAQ.%{name}
 Source2:	zend.gif
 Source3:	%{name}-module-install
@@ -99,8 +95,8 @@
 Source6:	%{name}-cgi.ini
 Source7:	%{name}-apache.ini
 Source8:	%{name}-cli.ini
-Source9:	http://www.hardened-php.net/hardening-patch-%{version}-0.4.3.patch.gz
-# Source9-md5:	6af27b59251bb9ce4741b17e2e5358f7
+Source9:	http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz
+# Source9-md5:	47a742fa9fab2826ad10c13a2376111a
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-pldlogo.patch
 Patch2:		%{name}-mail.patch
@@ -121,23 +117,17 @@
 Patch17:	%{name}-no_pear_install.patch
 Patch18:	%{name}-zlib.patch
 Patch19:	%{name}-sybase-fix.patch
-Patch20:	%{name}-mnogosearch-fix.patch
+Patch20:	%{name}-readline.patch
 Patch21:	%{name}-nohttpd.patch
-Patch22:	%{name}-lib64.patch
 Patch23:	%{name}-gd_imagerotate_enable.patch
 Patch24:	%{name}-uint32_t.patch
 Patch25:	%{name}-hwapi-link.patch
 Patch26:	%{name}-dba-link.patch
 Patch27:	%{name}-install_gd_headers.patch
-Patch28:	%{name}-cpdf-fix.patch
 Patch29:	%{name}-gcc4.patch
-Patch30:	%{name}-both-apxs.patch
-Patch31:	%{name}-builddir.patch
-Patch32:	%{name}_bug34435.patch
-Patch33:	%{name}-ftp-ssllibs.patch
-Patch34:	%{name}-bug-35009.patch
-Patch35:	%{name}-bug-33720.patch
-Patch36:	%{name}-dextension.patch
+Patch30:	%{name}-hardening-fix.patch
+Patch31:	%{name}-both-apxs.patch
+Patch32:	%{name}-builddir.patch
 Icon:		php.gif
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
@@ -148,15 +138,14 @@
 BuildRequires:	bzip2-devel
 %{?with_curl:BuildRequires:	curl-devel >= 7.12.0}
 BuildRequires:	cyrus-sasl-devel
-%{!?with_db3:BuildRequires:	db-devel >= 4.0}
 %{?with_db3:BuildRequires:	db3-devel >= 3.1}
+%{!?with_db3:BuildRequires:	db-devel >= 4.0}
 BuildRequires:	elfutils-devel
 %if %{with xmlrpc}
 BuildRequires:	expat-devel
 %endif
-%{?with_fam:BuildRequires:	fam-devel}
-%{?with_fcgi:BuildRequires:	fcgi-devel}
 %{?with_fdf:BuildRequires:	fdftk-devel}
+%{?with_fcgi:BuildRequires:	fcgi-devel}
 BuildRequires:	flex
 %if %{with mssql} || %{with sybase} || %{with sybase_ct}
 BuildRequires:	freetds-devel
@@ -166,19 +155,18 @@
 BuildRequires:	gdbm-devel
 BuildRequires:	gmp-devel
 %{?with_imap:BuildRequires:	imap-devel >= 1:2001-0.BETA.200107022325.2}
-%{?with_cpdf:BuildRequires:	libcpdf-devel >= 2.02r1-2}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel >= 1.4
 BuildRequires:	libmcrypt-devel >= 2.4.4
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1.4.3
+BuildRequires:	libwrap-devel
 BuildRequires:	libxml2-devel >= 2.5.10
 BuildRequires:	libxslt-devel >= 1.0.18
 %{?with_mhash:BuildRequires:	mhash-devel}
 %{?with_ming:BuildRequires:	ming-devel >= 0.1.0}
 %{?with_mm:BuildRequires:	mm-devel >= 1.3.0}
-%{?with_mnogosearch:BuildRequires:	mnogosearch-devel >= 3.2.6}
 BuildRequires:	mysql-devel >= 4.0.0
 %{?with_mysqli:BuildRequires:	mysql-devel >= 4.1.0}
 BuildRequires:	ncurses-ext-devel
@@ -186,13 +174,12 @@
 %if %{with openssl} || %{with ldap}
 BuildRequires:	openssl-devel >= 0.9.7d
 %endif
-BuildRequires:	%{__perl}
-%{?with_snmp:BuildRequires:	net-snmp-devel >= 5.0.7}
 BuildRequires:	pam-devel
 %{?with_pcre:BuildRequires:	pcre-devel}
+BuildRequires:	%{__perl}
 %{?with_msession:BuildRequires:	phoenix-devel}
-%{?with_pgsql:BuildRequires:	postgresql-backend-devel >= 7.2}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
+%{?with_pgsql:BuildRequires:	postgresql-backend-devel >= 7.2}
 BuildRequires:	readline-devel
 %{?with_recode:BuildRequires:	recode-devel >= 3.5d-3}
 BuildRequires:	rpm-build >= 4.4.0
@@ -200,6 +187,7 @@
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 BuildRequires:	t1lib-devel
 %{?with_tidy:BuildRequires:	tidy-devel}
+%{?with_snmp:BuildRequires:	net-snmp-devel >= 5.0.7}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
 %{?with_xmlrpc:BuildRequires:	xmlrpc-epi-devel}
 BuildRequires:	zlib-devel >= 1.0.9
@@ -218,9 +206,9 @@
 %define		extensionsdir	%{_libdir}/php
 
 # must be in sync with source. extra check ensuring that it is so is done in %%build
-%define		php_api_version		20031224
-%define		zend_module_api		20041030
-%define		zend_extension_api	220040412
+%define		php_api_version		20041225
+%define		zend_module_api		20050922
+%define		zend_extension_api	220051025
 %define		zend_zts			%{!?with_zts:0}%{?with_zts:1}
 %define		php_debug			%{!?debug:0}%{?debug:1}
 
@@ -294,14 +282,17 @@
 Summary:	PHP DSO module for apache 1.3.x
 Summary(pl):	Moduł DSO (Dynamic Shared Object) php dla apache 1.3.x
 Group:		Development/Languages/PHP
-Requires(post,preun):	%{__perl}
-Requires(post,preun):	%{apxs1}
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires(post,preun):	%{apxs1}
+Requires(post,preun):	%{__perl}
 Requires:	apache1(EAPI) >= 1.3.33-2
 Requires:	apache1-mod_mime
+Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
 Obsoletes:	apache-mod_php < 1:4.1.1
+# Obsolete all php5 packages, this is not to obsolete php4 companion
+Obsoletes:	php >= 4:5.0.0
 
 %description -n apache1-mod_php
 PHP as DSO module for apache 1.3.x.
@@ -314,11 +305,14 @@
 Summary(pl):	Moduł DSO (Dynamic Shared Object) php dla apache 2.x
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	apache(modules-api) = %{apache_modules_api}
 Requires:	apache >= 2.0.52-2
+Requires:	apache(modules-api) = %{apache_modules_api}
+Provides:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
 Obsoletes:	apache-mod_php < 1:4.1.1
+# Obsolete all php5 packages, this is not to obsolete php4 companion
+Obsoletes:	php >= 4:5.0.0
 
 %description -n apache-mod_php
 PHP as DSO module for apache 2.x.
@@ -423,11 +417,11 @@
 Summary(ru):	đÁËĹÔ ŇÁÚŇÁÂĎÔËÉ ÄĚŃ ĐĎÓÔŇĎĹÎÉŃ ŇÁÓŰÉŇĹÎÉĘ PHP
 Summary(uk):	đÁËĹÔ ŇĎÚŇĎÂËÉ ÄĚŃ ĐĎÂŐÄĎ×É ŇĎÚŰÉŇĹÎŘ PHP
 Group:		Development/Languages/PHP
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	autoconf
 Requires:	automake
 Requires:	libtool
 Requires:	shtool
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Obsoletes:	php-pear-devel
 Obsoletes:	php4-devel
 
@@ -503,20 +497,6 @@
 %description calendar -l pl
 Moduł PHP dodający wsparcie dla kalendarza.
 
-%package cpdf
-Summary:	cpdf extension module for PHP
-Summary(pl):	Moduł cpdf dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description cpdf
-This is a dynamic shared object (DSO) for PHP that will add PDF
-support through libcpdf library.
-
-%description cpdf -l pl
-Moduł PHP dodający obsługę plików PDF poprzez bibliotekę libcpdf.
-
 %package ctype
 Summary:	ctype extension module for PHP
 Summary(pl):	Moduł ctype dla PHP
@@ -574,36 +554,6 @@
 %description dbase -l pl
 Moduł PHP ze wsparciem dla DBase.
 
-%package dbx
-Summary:	DBX extension module for PHP
-Summary(pl):	Moduł DBX dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description dbx
-This is a dynamic shared object (DSO) for PHP that will add DB
-abstraction layer. DBX supports odbc, mysql, pgsql, mssql, fbsql and
-more.
-
-%description dbx -l pl
-Moduł PHP dodający warstwę abstrakcji do obsługi baz danych. DBX
-obsługuje bazy odbc, mysql, pgsql, mssql, fbsql i inne.
-
-%package dio
-Summary:	Direct I/O extension module for PHP
-Summary(pl):	Moduł Direct I/O dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description dio
-This is a dynamic shared object (DSO) for PHP that will add direct
-file I/O support.
-
-%description dio -l pl
-Moduł PHP dodający obsługę bezpośrednich operacji I/O na plikach.
-
 %package dom
 Summary:	DOM extension module for PHP
 Summary(pl):	Moduł DOM dla PHP
@@ -635,23 +585,6 @@
 %description exif -l pl
 Moduł PHP dodający obsługę znaczników EXIF w plikach obrazków.
 
-%package fam
-Summary:	FAM (File Alteration Monitor) module for PHP
-Summary(pl):	Moduł FAM (File Alteration Monitor) dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description fam
-This PHP module adds support for FAM (File Alteration Monitor). FAM
-monitors files and directories, notifying interested applications of
-changes.
-
-%description fam -l pl
-Moduł PHP dodający obsługę dla FAM (File Alteration Monitor). FAM
-monitoruje pliki oraz katalogi, informując zainteresowane aplikacje o
-zmianach.
-
 %package fdf
 Summary:	FDF extension module for PHP
 Summary(pl):	Moduł FDF dla PHP
@@ -894,21 +827,6 @@
 Moduł PHP dodający obsługę plików Flash (.swf) poprzez bibliotekę
 ming.
 
-%package mnogosearch
-Summary:	mnoGoSearch extension module for PHP
-Summary(pl):	Moduł mnoGoSearch dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description mnogosearch
-This is a dynamic shared object (DSO) for PHP that will allow you to
-access mnoGoSearch free search engine.
-
-%description mnogosearch -l pl
-Moduł PHP dodający pozwalający na dostęp do wolnodostępnego silnika
-wyszukiwarki mnoGoSearch.
-
 %package msession
 Summary:	msession extension module for PHP
 Summary(pl):	Moduł msession dla PHP
@@ -1097,6 +1015,96 @@
 Moduł PHP umożliwiający korzystanie z perlowych wyrażeń regularnych
 (Perl Compatible Regular Expressions)
 
+%package pdo
+Summary:	PHP Data Objects (PDO)
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+
+%description pdo
+This is a dynamic shared object (DSO) for PHP that will add PDO
+support.
+
+%package pdo-dblib
+Summary:	PHP Data Objects (PDO) FreeTDS support
+Summary(pl):	Moduł PHP Data Objects (PDO) z wsparciem do FreeTDS
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
+
+%description pdo-dblib
+This is a dynamic shared object (DSO) for PHP that will add PDO
+FreeTDS support.
+
+%description pdo-dblib -l pl
+Moduł dla PHP dodający obsługę dla baz danych FreeTDS za pośrednictwem
+interfejsu PDO.
+
+%package pdo-mysql
+Summary:	PHP Data Objects (PDO) MySQL support
+Summary(pl):	Moduł PHP Data Objects (PDO) z wsparciem do MySQL
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
+
+%description pdo-mysql
+This is a dynamic shared object (DSO) for PHP that will add PDO MySQL
+support.
+
+%description pdo-mysql -l pl
+Moduł dla PHP dodający obsługę dla baz danych MySQL za pośrednictwem
+interfejsu PDO.
+
+%package pdo-odbc
+Summary:	PHP Data Objects (PDO) ODBC support
+Summary(pl):	Moduł PHP Data Objects (PDO) z wsparciem do ODBC
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
+
+%description pdo-odbc
+This is a dynamic shared object (DSO) for PHP that will add PDO ODBC
+support.
+
+%description pdo-odbc -l pl
+Moduł dla PHP dodający obsługę dla baz danych ODBC za pośrednictwem
+interfejsu PDO.
+
+%package pdo-pgsql
+Summary:	PHP Data Objects (PDO) PostgreSQL support
+Summary(pl):	Moduł PHP Data Objects (PDO) z wsparciem do PostgreSQL
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
+
+%description pdo-pgsql
+This is a dynamic shared object (DSO) for PHP that will add PDO
+PostgreSQL support.
+
+%description pdo-pgsql -l pl
+Moduł dla PHP dodający obsługę dla baz danych PostgreSQL za
+pośrednictwem interfejsu PDO.
+
+%package pdo-sqlite
+Summary:	PHP Data Objects (PDO) SQLite support
+Summary(pl):	Moduł PHP Data Objects (PDO) z wsparciem do SQLite
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-pdo = %{epoch}:%{version}-%{release}
+
+%description pdo-sqlite
+This is a dynamic shared object (DSO) for PHP that will add PDO SQLite
+support.
+
+%description pdo-sqlite -l pl
+Moduł dla PHP dodający obsługę dla baz danych SQLite za pośrednictwem
+interfejsu PDO.
+
 %package pgsql
 Summary:	PostgreSQL database module for PHP
 Summary(pl):	Moduł bazy danych PostgreSQL dla PHP
@@ -1206,6 +1214,16 @@
 
 Uwaga: to jest moduł eksperymentalny.
 
+%package simplexml
+Summary:	Simple XML extension module for PHP
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+
+%description simplexml
+This is a dynamic shared object (DSO) for PHP that will add Simple XML
+support.
+
 %package snmp
 Summary:	SNMP extension module for PHP
 Summary(pl):	Moduł SNMP dla PHP
@@ -1419,6 +1437,24 @@
 związanych z tymi plikami. Pozwala on tworzyć analizatory XML-a i
 następnie definiować procedury obsługi dla różnych zdarzeń XML.
 
+%package xmlreader
+Summary:	XML Reader extension module for PHP
+Summary(pl):	Moduł XML Reader dla PHP
+Group:		Libraries
+Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+
+%description xmlreader
+This is a dynamic shared object (DSO) for PHP that will add XML Reader
+support. The XMLReader extension is an XML Pull parser. The reader
+acts as a cursor going forward on the document stream and stopping at
+each node on the way.
+
+%description xmlreader -l pl
+Moduł PHP umożliwiający parsowanie plików XML w trybie Pull. Czytnik
+działa jako kursor przechodzący przez strumień dokumentu i
+zatrzymujący się nakażdym węźle po drodze.
+
 %package xmlrpc
 Summary:	xmlrpc extension module for PHP
 Summary(pl):	Moduł xmlrpc dla PHP
@@ -1456,20 +1492,6 @@
 %description xsl -l pl
 Moduł PHP dodający nową obsługę XSLT (przy użyciu libxslt).
 
-%package yp
-Summary:	NIS (yp) extension module for PHP
-Summary(pl):	Moduł NIS (yp) dla PHP
-Group:		Libraries
-Requires(post,preun):	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description yp
-This is a dynamic shared object (DSO) for PHP that will add NIS
-(Yellow Pages) support.
-
-%description yp -l pl
-Moduł PHP dodający wsparcie dla NIS (Yellow Pages).
-
 %package zlib
 Summary:	Zlib extension module for PHP
 Summary(pl):	Moduł zlib dla PHP
@@ -1497,14 +1519,17 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
+# FIXME; it's still needed?
+# %patch9 -p1
 cp php.ini-dist php.ini
 %patch10 -p1
 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
 # conditionally...
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
+# DROPME: not needed
+# %patch12 -p1
+# DROPME: seems not needed
+# %patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -1513,27 +1538,20 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch28 -p1
-%if "%{_lib}" == "lib64"
-%patch22 -p1
-%endif
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch27 -p1
-%patch29 -p1
+# FIXME: ???
+# %patch27 -p1
+# %patch29 -p1
 
 %if %{with hardening}
 zcat %{SOURCE9} | patch -p1
+patch -p1 < %{PATCH30}
 %endif
-%patch30 -p1
 %patch31 -p1
-%patch32 -p0
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
+%patch32 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1612,32 +1630,48 @@
 	esac
 	` \
 	--cache-file=config.cache \
+	--with-libdir=%{_lib} \
 	--with-config-file-path=%{_sysconfdir} \
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
 	--with-exec-dir=%{_bindir} \
 	--%{!?debug:dis}%{?debug:en}able-debug \
+	--enable-zend-multibyte \
 	%{?with_zts:--enable-maintainer-zts} \
 	--enable-memory-limit \
 	--enable-bcmath=shared \
 	--enable-calendar=shared \
 	--enable-ctype=shared \
 	--enable-dba=shared \
-	--enable-dbx=shared \
-	--enable-dio=shared \
+	--with-inifile \
+	--with-flatfile \
 	--enable-dom=shared \
 	--enable-exif=shared \
 	--enable-filepro=shared \
 	--enable-ftp=shared \
 	--enable-gd-native-ttf \
 	--enable-gd-jus-conf \
+	--enable-libxml \
 	--enable-magic-quotes \
 	--enable-mbstring=shared,all \
 	--enable-mbregex \
 	--enable-pcntl=shared \
+	--enable-pdo=shared \
+%if %{with mssql} || %{with sybase} || %{with sybase_ct}
+	--with-pdo-dblib=shared \
+%endif
+%if %{with interbase} && %{without interbase_inst}
+	--with-pdo-firebird=shared \
+%endif
+	--with-pdo-mysql=shared \
+	%{?with_oracle:--with-pdo-oci=shared} \
+	%{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
+	%{?with_pgsql:--with-pdo-pgsql=shared} \
+	%{?with_sqlite:--with-pdo-sqlite=shared} \
 	--enable-posix=shared \
 	--enable-session \
 	--enable-shared \
 	--enable-shmop=shared \
+	--enable-simplexml \
 	--enable-sysvmsg=shared \
 	--enable-sysvsem=shared \
 	--enable-sysvshm=shared \
@@ -1650,12 +1684,11 @@
 	--enable-ucd-snmp-hack \
 	%{?with_wddx:--enable-wddx=shared} \
 	--enable-xml=shared \
-	--enable-yp=shared \
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.515&r2=1.516&f=u




More information about the pld-cvs-commit mailing list