X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=cc7df843d8a03b9924a97f5eba554ac765f8cf9f;hb=003e9495a48357cb704c4e3878c0c969eb96b108;hp=39d9d25d7f5aef7febe7f1420a9b177aac84b0bd;hpb=4e17f3c322b291d48bcb0d11d8f874eb7eeebb96;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index 39d9d25..cc7df84 100644
--- a/php.spec
+++ b/php.spec
@@ -1,31 +1,13 @@
 # NOTES
 # - mysqlnd driver doesn't support reconnect: https://bugs.php.net/bug.php?id=52561
-# TODO 7.4:
-# - follow upstream: drop spl, pcre, hash subpackages (tired of maintaining them)
-# TODO 7.3:
-# - branch php-7.2 and merge dev-7.3 into head once official announcement ready
-# TODO 7.2:
-# - https://github.com/php/php-src/blob/php-7.2.0/UPGRADING
 # TODO 5.6:
 # - enable --with-fpm-systemd, but ensure it checks for sd_booted()
-# TODO 5.4:
-# - update imap annotations patch (needs api porting)
-# - update imap myrights patch (needs api porting)
 # TODO:
 # - fileinfo extension bundles magic db in library: data_file.c (dump of magic.mgc) is 14M
 #   - 2.3M fileinfo.so php54-fileinfo-5.4.6-0.15.x86_64
 #   - 2.3M fileinfo.so php-fileinfo-5.3.16-1.x86_64
 #   -  13K fileinfo.so php-pecl-fileinfo-1.0.4-8.amd64
 # - ttyname_r() misdetected http://bugs.php.net/bug.php?id=48820
-# - modularize standard (output from pure php -m)?
-# - some mods should be shared:
-#$ php -m
-# [PHP Modules]
-# Core
-# date
-# libxml
-# Reflection
-# standard
 #
 # Conditional build:
 # - packaging options
@@ -56,16 +38,15 @@
 %bcond_without	dom		# without DOM extension module
 %bcond_without	enchant		# without Enchant extension module
 %bcond_without	exif		# without EXIF extension module
+%bcond_without	ffi		# without FFI extension module
 %bcond_without	fileinfo	# without fileinfo extension module
 %bcond_without	filter		# without filter extension module
 %bcond_without	ftp		# without FTP extension module
 %bcond_without	gd		# without GD extension module
 %bcond_without	gettext		# without gettext extension module
 %bcond_without	gmp		# without gmp extension module
-%bcond_without	hash		# without hash extension module
 %bcond_without	iconv		# without iconv extension module
 %bcond_without	imap		# without IMAP extension module
-%bcond_without	interbase	# without InterBase extension module
 %bcond_without	intl		# without Intl extension module
 %bcond_without	json		# without json extension module
 %bcond_without	ldap		# without LDAP extension module
@@ -78,7 +59,7 @@
 %bcond_without	opcache		# without Enable Zend OPcache extension support
 %bcond_without	openssl		# without OpenSSL support and OpenSSL extension (module)
 %bcond_without	pcntl		# without pcntl extension module
-%bcond_without	pcre		# without PCRE extension module
+%bcond_without	pcre_jit	# PCRE JIT
 %bcond_without	pdo		# without PDO extension module
 %bcond_without	pdo_dblib	# without PDO dblib extension module
 %bcond_without	pdo_firebird	# without PDO Firebird extension module
@@ -113,6 +94,11 @@
 %define apxs1		/usr/sbin/apxs1
 %define	apxs2		/usr/sbin/apxs
 
+# segfaults on x32
+%ifarch x32
+%undefine	with_pcre_jit
+%endif
+
 # disable all sapis
 %if %{with gcov}
 %undefine	with_apache2
@@ -134,11 +120,6 @@
 %undefine	with_milter
 %endif
 
-%ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha
-# ppc disabled (broken on th-ppc)
-%undefine	with_interbase
-%endif
-
 %if %{without odbc}
 %undefine	with_pdo_odbc
 %endif
@@ -151,20 +132,11 @@
 %undefine	with_pdo_oci
 %endif
 
-%if %{without interbase} || %{with interbase_inst}
-%undefine	with_pdo_firebird
-%endif
-
 %ifnarch %{ix86} %{x8664} x32
 # unsupported, see sapi/cgi/fpm/fpm_atomic.h
 %undefine	with_fpm
 %endif
 
-# filter depends on pcre
-%if %{without pcre}
-%undefine	with_filter
-%endif
-
 %if %{without pdo}
 %undefine	with_pdo_dblib
 %undefine	with_pdo_firebird
@@ -176,6 +148,7 @@
 %endif
 
 %define		subver alpha1
+%define		rel	1
 %define		orgname	php
 %define		ver_suffix 74
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -187,7 +160,7 @@ Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
 Version:	7.4.0
-Release:	0.1
+Release:	1.%{subver}.%{rel}
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -212,7 +185,6 @@ Patch1:		%{orgname}-pldlogo.patch
 Patch2:		%{orgname}-mail.patch
 Patch3:		%{orgname}-link-libs.patch
 Patch4:		intl-stdc++.patch
-
 Patch7:		%{orgname}-sapi-ini-file.patch
 Patch8:		milter.patch
 Patch9:		libtool-tag.patch
@@ -226,21 +198,15 @@ Patch22:	%{orgname}-both-apxs.patch
 Patch23:	%{orgname}-builddir.patch
 Patch24:	%{orgname}-zlib-for-getimagesize.patch
 Patch25:	%{orgname}-stupidapache_version.patch
-Patch26:	%{orgname}-pear.patch
 Patch27:	%{orgname}-config-dir.patch
 Patch29:	%{orgname}-fcgi-graceful.patch
 Patch31:	%{orgname}-fcgi-error_log-no-newlines.patch
-Patch34:	%{orgname}-libtool.patch
 Patch39:	%{orgname}-use-prog_sendmail.patch
 Patch41:	%{orgname}-fpm-config.patch
 Patch42:	%{orgname}-fpm-shared.patch
 Patch43:	%{orgname}-silent-session-cleanup.patch
 Patch44:	%{orgname}-include_path.patch
-Patch45:	%{orgname}-imap-annotations.patch
-Patch46:	%{orgname}-imap-myrights.patch
 Patch50:	extension-shared-optional-dep.patch
-Patch51:	spl-shared.patch
-Patch52:	pcre-shared.patch
 Patch53:	fix-test-run.patch
 Patch55:	bug-52078-fileinode.patch
 Patch59:	%{orgname}-systzdata.patch
@@ -251,9 +217,8 @@ Patch67:	mysql-lib-ver-mismatch.patch
 Patch68:	php-mysql-ssl-context.patch
 Patch70:	mysqlnd-ssl.patch
 Patch71:	libdb-info.patch
-Patch72:	phar-hash-shared.patch
 URL:		http://php.net/
-%{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
+%{?with_pdo_firebird:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1.4d
@@ -266,6 +231,7 @@ BuildRequires:	elfutils-devel
 %{?with_enchant:BuildRequires:	enchant-devel >= 1.1.3}
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 %{?with_argon2:BuildRequires:	libargon2-devel >= 20161029}
+%{?with_ffi:BuildRequires:	libffi-devel}
 %{?with_sodium:BuildRequires:	libsodium-devel >= 1.0.8}
 %if %{with pdo_dblib}
 BuildRequires:	freetds-devel >= 0.82
@@ -279,17 +245,13 @@ BuildRequires:	gmp-devel >= 4.2
 %{?with_imap:BuildRequires:	imap-devel >= 1:2007e-2}
 %{?with_gcov:BuildRequires:	lcov}
 %{?with_fpm:BuildRequires:	libapparmor-devel}
-%{?with_intl:BuildRequires:	libicu-devel >= 4.4}
+%{?with_intl:BuildRequires:	libicu-devel >= 50.1}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel >= 1.4
 BuildRequires:	libpng-devel >= 1.0.8
 %{?with_intl:BuildRequires:	libstdc++-devel}
-%{?with_webp:BuildRequires:	libwebp-devel}
-%if "%{pld_release}" != "ac"
 BuildRequires:	libtool >= 2:2.4.6
-%else
-BuildRequires:	libtool >= 1.4.3
-%endif
+%{?with_webp:BuildRequires:	libwebp-devel}
 BuildRequires:	libxml2-devel >= 1:2.7.6-4
 %{?with_xsl:BuildRequires:	libxslt-devel >= 1.1.0}
 %{?with_zip:BuildRequires:	libzip-devel >= 1.3.1}
@@ -305,7 +267,7 @@ BuildRequires:	openssl-devel >= 1.0.1
 %endif
 %{?with_oci:%{?with_instantclient:BuildRequires:	oracle-instantclient-devel}}
 BuildRequires:	pam-devel
-%{?with_pcre:BuildRequires:	pcre2-8-devel >= 10.30}
+BuildRequires:	pcre2-8-devel >= 10.30
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
@@ -599,28 +561,42 @@ Provides:	%{name}(zend_extension_api) = %{zend_extension_api}
 Provides:	%{name}(zend_module_api) = %{zend_module_api}
 Provides:	%{name}-core
 Provides:	%{name}-date
+Provides:	%{name}-hash = %{epoch}:%{version}-%{release}
+Provides:	%{name}-pcre = %{epoch}:%{version}-%{release}
 Provides:	%{name}-reflection
+Provides:	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	%{name}-standard
 Provides:	php(core) = %{version}
 Provides:	php(date)
+Provides:	php(hash) = %{hashver}
 Provides:	php(libxml)
+Provides:	php(pcre)
 Provides:	php(reflection)
+Provides:	php(spl)
 Provides:	php(standard)
 %{!?with_mysqlnd:Obsoletes:	%{name}-mysqlnd}
-%{?with_pcre:%requires_ge_to	pcre2-8 pcre2-8-devel}
+%requires_ge_to	pcre2-8 pcre2-8-devel
 Suggests:	browscap
 Obsoletes:	php-common < 4:5.3.28-7
-# withdrawn modules
 Obsoletes:	php-filepro < 4:5.2.0
+Obsoletes:	php-hash < 4:5.3.28-7
 Obsoletes:	php-hwapi < 4:5.2.0
 Obsoletes:	php-hyperwave < 3:5.0.0
 Obsoletes:	php-java < 3:5.0.0
 Obsoletes:	php-mcal < 3:5.0.0
+Obsoletes:	php-pcre < 4:5.3.28-7
 Obsoletes:	php-pecl-domxml
+Obsoletes:	php-pecl-hash < %{hashver}
 Obsoletes:	php-qtdom < 3:5.0.0
+Obsoletes:	php-spl < 4:5.3.28-7
 Conflicts:	php4-common < 3:4.4.4-8
 Conflicts:	php55-common < 4:5.5.10-4
 Conflicts:	rpm < 4.4.2-0.2
+%if %{with mhash}
+Provides:	php(mhash)
+Provides:	php-mhash = %{epoch}:%{version}-%{release}
+Obsoletes:	php-mhash < 4:5.3.0
+%endif
 
 %description common
 Common files needed by both Apache modules and CGI/CLI SAPIs.
@@ -644,14 +620,10 @@ Summary(ru.UTF-8):	Пакет разработки для построения 
 Summary(uk.UTF-8):	Пакет розробки для побудови розширень PHP
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	autoconf >= 2.13
-Requires:	automake
-%if "%{pld_release}" != "ac"
+Requires:	autoconf >= 2.59
+Requires:	automake >= 1.4d
 Requires:	libtool >= 2:2.4.6
-%else
-Requires:	libtool
-%endif
-%{?with_pcre:Requires:	pcre2-8-devel >= 10.30}
+Requires:	pcre2-8-devel >= 10.30
 Requires:	shtool
 Provides:	php-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	php-devel
@@ -871,6 +843,17 @@ support in image files.
 %description exif -l pl.UTF-8
 Moduł PHP dodający obsługę znaczników EXIF w plikach obrazków.
 
+%package ffi
+Summary:	%{modname} - Foreign Function Interface
+Group:		Libraries
+URL:		https://www.php.net/manual/en/book.ffi.php
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Provides:	php(ffi) = %{version}
+
+%description ffi
+FFI is a multi-platform extension for PHP that allows you to bind to
+functions from arbitrary shared libraries and call them.
+
 %package fileinfo
 Summary:	libmagic bindings
 Summary(pl.UTF-8):	Wiązania do libmagic
@@ -994,29 +977,6 @@ length number support with GNU MP library.
 Moduł PHP umożliwiający korzystanie z biblioteki gmp do obliczeń na
 liczbach o dowolnej długości.
 
-%package hash
-Summary:	HASH Message Digest Framework
-Summary(pl.UTF-8):	Szkielet do obliczania skrótów wiadomości
-Group:		Libraries
-URL:		http://php.net/manual/en/book.gmp.php
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php(hash) = %{hashver}
-%if %{with mhash}
-Provides:	php(mhash)
-Provides:	php-mhash = %{epoch}:%{version}-%{release}
-Obsoletes:	php-mhash < 4:5.3.0
-%endif
-Obsoletes:	php-hash < 4:5.3.28-7
-Obsoletes:	php-pecl-hash < %{hashver}
-
-%description hash
-Native implementations of common message digest algorithms using a
-generic factory method.
-
-%description hash -l pl.UTF-8
-Natywne implementacje popularnych algorytmów obliczania skrótów
-wiadomości przy użyciu wspólnego interfejsu.
-
 %package iconv
 Summary:	iconv extension module for PHP
 Summary(pl.UTF-8):	Moduł iconv dla PHP
@@ -1057,26 +1017,6 @@ Moduł PHP dodający obsługę skrzynek IMAP.
 %description imap -l pt_BR.UTF-8
 Um módulo para aplicações PHP que usam IMAP.
 
-%package interbase
-Summary:	InterBase/Firebird database module for PHP
-Summary(pl.UTF-8):	Moduł bazy danych InterBase/Firebird dla PHP
-Group:		Libraries
-URL:		http://php.net/manual/en/book.ibase.php
-%if %{with interbase_inst}
-%{?requires_php_extension}
-%else
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-%endif
-Provides:	php(interbase)
-Obsoletes:	php-interbase < 4:5.3.28-7
-
-%description interbase
-This is a dynamic shared object (DSO) for PHP that will add InterBase
-and Firebird database support.
-
-%description interbase -l pl.UTF-8
-Moduł PHP umożliwiający dostęp do baz danych InterBase i Firebird.
-
 %package intl
 Summary:	Internationalization extension (ICU wrapper)
 Summary(pl.UTF-8):	Rozszerzenie do internacjonalizacji (interfejs do ICU)
@@ -1312,22 +1252,6 @@ waitpid(), signal() etc.
 Moduł PHP umożliwiający tworzenie nowych procesów i kontrolę nad nimi.
 Obsługuje funkcje takie jak fork(), waitpid(), signal() i podobne.
 
-%package pcre
-Summary:	PCRE extension module for PHP
-Summary(pl.UTF-8):	Moduł PCRE dla PHP
-Group:		Libraries
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Provides:	php(pcre)
-Obsoletes:	php-pcre < 4:5.3.28-7
-
-%description pcre
-This is a dynamic shared object (DSO) for PHP that will add Perl
-Compatible Regular Expression support.
-
-%description pcre -l pl.UTF-8
-Moduł PHP umożliwiający korzystanie z perlowych wyrażeń regularnych
-(Perl Compatible Regular Expressions)
-
 %package pdo
 Summary:	PHP Data Objects (PDO)
 Summary(pl.UTF-8):	Obsługa PHP Data Objects (PDO)
@@ -1708,24 +1632,6 @@ Provides:	php(sodium) = %{sodiumver}
 %description sodium
 A simple, low-level PHP extension for libsodium.
 
-%package spl
-Summary:	Standard PHP Library module for PHP
-Summary(pl.UTF-8):	Moduł biblioteki standardowej (Standard PHP Library) dla PHP
-Group:		Libraries
-URL:		http://php.net/manual/en/book.spl.php
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	%{name}-pcre = %{epoch}:%{version}-%{release}
-Requires:	%{name}-simplexml = %{epoch}:%{version}-%{release}
-Provides:	php(spl)
-Obsoletes:	php-spl < 4:5.3.28-7
-
-%description spl
-This is a dynamic shared object (DSO) for PHP that will add Standard
-PHP Library support.
-
-%description spl -l pl.UTF-8
-Moduł PHP z biblioteką standardową PHP (SPL - Standard PHP Library).
-
 %package sqlite3
 Summary:	SQLite3 extension module for PHP
 Summary(pl.UTF-8):	Moduł SQLite3 dla PHP
@@ -2004,23 +1910,16 @@ cp -p php.ini-production php.ini
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
-%patch26 -p1
 %patch27 -p1
 %patch29 -p1
 %patch31 -p1
-%if "%{pld_release}" != "ac"
-%patch34 -p1
-%endif
 %patch39 -p1
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
 %patch44 -p1
-#%patch45 -p1 # imap annotations. fixme
-#%patch46 -p1 # imap myrights. fixme
 %patch50 -p1
-%patch51 -p1 -b .spl-shared
-%patch52 -p1 -b .pcre-shared
+
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
@@ -2033,7 +1932,6 @@ cp -p php.ini-production php.ini
 #%patch68 -p1 DROP or update to 7.0 APIs
 %patch70 -p1
 %patch71 -p1
-%patch72 -p1 -b .phar-shared
 
 %{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
@@ -2055,7 +1953,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 #%{__rm} -r ext/dba/libinifile
 #%{__rm} -r ext/gd/libgd
 #%{__rm} -r ext/mbstring/libmbfl
-%{__rm} -r ext/pcre/pcre2lib
+#%{__rm} -r ext/pcre/pcre2lib
 #%{__rm} -r ext/soap/interop
 %{__rm} -r ext/xmlrpc/libxmlrpc
 #%{__rm} -r ext/zip/lib
@@ -2229,6 +2127,11 @@ if test "$ver" != "PHP_VERSION"; then
 fi
 
 export EXTENSION_DIR="%{php_extensiondir}"
+
+# Set PEAR_INSTALLDIR to ensure that the hard-coded include_path
+# includes the PEAR directory even though pear is packaged separately.
+export PEAR_INSTALLDIR=%{php_pear_dir}
+
 # configure once (for faster debugging purposes)
 if [ ! -f _built-conf ]; then
 	# now remove Makefile copies
@@ -2349,7 +2252,6 @@ for sapi in $sapis; do
 	%{__enable_disable pcntl pcntl shared} \
 	%{__enable_disable pdo pdo shared} \
 	%{__enable_disable json json shared} \
-	%{__enable_disable hash hash shared} \
 	--enable-xmlwriter=shared \
 %if %{with fpm}
 	--with-fpm-user=http \
@@ -2359,7 +2261,7 @@ for sapi in $sapis; do
 	--with-pdo-dblib=shared \
 %endif
 %if %{with pdo_firebird}
-	--with-pdo-firebird=shared,/usr \
+	--with-pdo-firebird=shared \
 %endif
 	%{?with_mhash:--with-mhash=yes} \
 	--with-mysql-sock=/var/lib/mysql/mysql.sock \
@@ -2367,9 +2269,8 @@ for sapi in $sapis; do
 	%{?with_pdo_oci:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
 	%{?with_pdo_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
 	%{?with_pdo_pgsql:--with-pdo-pgsql=shared} \
-	%{?with_pdo_sqlite:--with-pdo-sqlite=shared,/usr} \
-	%{?with_webp:--with-webp-dir=/usr} \
-	--without-libexpat-dir \
+	%{?with_pdo_sqlite:--with-pdo-sqlite=shared} \
+	%{?with_webp:--with-webp} \
 	%{__enable_disable posix posix shared} \
 	--enable-shared \
 	%{__enable_disable session session shared} \
@@ -2388,15 +2289,16 @@ for sapi in $sapis; do
 	%{__with_without curl curl shared} \
 	--with-db4 \
 	%{__with_without iconv iconv shared} \
-	%{?with_enchant:--with-enchant=shared,/usr} \
-	--with-freetype-dir=shared \
+	%{?with_enchant:--with-enchant=shared} \
+	--with-freetype \
 	%{__with_without gettext gettext shared} \
-	%{__with_without gd gd shared%{?with_system_gd:,/usr}} \
+	%{__enable_disable gd gd shared} \
+	%{?with_system_gd:--with-external-gd} \
 	--with-gdbm \
 	%{__with_without gmp gmp shared} \
+	%{__with_without ffi ffi shared} \
 	%{?with_imap:--with-imap=shared --with-imap-ssl} \
-	%{?with_interbase:--with-interbase=shared%{!?with_interbase_inst:,/usr}} \
-	--with-jpeg-dir=/usr \
+	--with-jpeg \
 	%{?with_ldap:--with-ldap=shared --with-ldap-sasl} \
 	%{?with_mm:--with-mm} \
 	%{?with_mysqlnd:--enable-mysqlnd=shared} \
@@ -2406,25 +2308,23 @@ for sapi in $sapis; do
 	%{?with_openssl:--with-openssl=shared} \
 	%{?with_kerberos5:--with-kerberos} \
 	--with-tcadb=/usr \
-	%{__with_without pcre pcre-regex /usr} \
+	--with-external-pcre \
+	%{__with_without pcre_jit pcre-jit} \
 	%{__enable_disable filter filter shared} \
-	--with-pear=%{php_pear_dir} \
-	%{__with_without pgsql pgsql shared,/usr} \
+	%{__with_without pgsql pgsql shared} \
 	%{__enable_disable phar phar shared} \
-	--with-png-dir=/usr \
 	%{?with_pspell:--with-pspell=shared} \
 	%{__with_without readline readline shared} \
 	%{?with_recode:--with-recode=shared} \
 	%{?with_snmp:--with-snmp=shared} \
 	%{!?with_pdo_sqlite:--without-pdo-sqlite} \
-	%{__with_without sqlite3 sqlite3 shared,/usr} \
+	%{__with_without sqlite3 sqlite3 shared} \
 	%{?with_tidy:--with-tidy=shared} \
-	%{?with_odbc:--with-unixODBC=shared,/usr} \
+	%{?with_odbc:--with-unixODBC=shared} \
 	%{__with_without xmlrpc xmlrpc shared,/usr} \
 	%{?with_xsl:--with-xsl=shared} \
 	--with-zlib=shared \
-	--with-zlib-dir=shared,/usr \
-	%{?with_zip:--enable-zip=shared,/usr --with-libzip} \
+	%{?with_zip:--with-zip=shared} \
 
 	# save for debug
 	cp -f Makefile Makefile.$sapi
@@ -2498,14 +2398,8 @@ generate_inifiles() {
 		# opcache.so is zend extension
 		nm $so | grep -q zend_extension_entry && ext=zend_extension
 		conf="$mod.ini"
-		# pre needs to be loaded before SPL
-		[ "$mod" = "pcre" ] && conf="PCRE.ini"
-		# spl needs to be loaded before mysqli
-		[ "$mod" = "spl" ] && conf="SPL.ini"
 		# session needs to be loaded before php-pecl-http, php-pecl-memcache, php-pecl-session_mysql
 		[ "$mod" = "session" ] && conf="Session.ini"
-		# hash needs to be loaded before mysqlnd
-		[ "$mod" = "hash" ] && conf="Hash.ini"
 		# mysqlnd needs to be loaded before mysqli,pdo_mysqli
 		[ "$mod" = "mysqlnd" ] && conf="MySQLND.ini"
 		echo "+ $conf"
@@ -2702,20 +2596,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
 # for CLI SAPI only
 %{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d}
 
-# use system automake and {lib,sh}tool
-ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/%{name}/build
-ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/%{name}/build
-for fn in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
-	f=%{_aclocaldir}/$fn
-	test -f $f || continue
-	ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
-done
-for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do
-	f=/usr/share/libtool/$fn
-	test -f $f || continue
-	ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
-	break
-done
 sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize
 
 # for php-pecl-mailparse
@@ -2729,8 +2609,6 @@ cp -a tests/* $RPM_BUILD_ROOT%{php_data_dir}/tests/php
 
 # fix install paths, avoid evil rpaths
 sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la
-# better solution?
-sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/acinclude.m4
 
 install -p ext/ext_skel.php $RPM_BUILD_ROOT%{_bindir}
 
@@ -2860,16 +2738,15 @@ fi \
 %extension_scripts dom
 %extension_scripts enchant
 %extension_scripts exif
+%extension_scripts ffi
 %extension_scripts fileinfo
 %extension_scripts filter
 %extension_scripts ftp
 %extension_scripts gd
 %extension_scripts gettext
 %extension_scripts gmp
-%extension_scripts hash
 %extension_scripts iconv
 %extension_scripts imap
-%extension_scripts interbase
 %extension_scripts intl
 %extension_scripts json
 %extension_scripts ldap
@@ -2880,17 +2757,16 @@ fi \
 %extension_scripts odbc
 %extension_scripts opcache
 %extension_scripts openssl
-%extension_scripts pcre
+%extension_scripts pcntl
 %extension_scripts pdo
 %extension_scripts pdo-dblib
 %extension_scripts pdo-firebird
-%extension_scripts pdo-oci
 %extension_scripts pdo-mysql
+%extension_scripts pdo-oci
 %extension_scripts pdo-odbc
 %extension_scripts pdo-pgsql
 %extension_scripts pdo-sqlite
 %extension_scripts pgsql
-%extension_scripts pcntl
 %extension_scripts posix
 %extension_scripts pspell
 %extension_scripts recode
@@ -2901,7 +2777,6 @@ fi \
 %extension_scripts soap
 %extension_scripts sockets
 %extension_scripts sodium
-%extension_scripts spl
 %extension_scripts sqlite3
 %extension_scripts sysvmsg
 %extension_scripts sysvsem
@@ -3009,7 +2884,7 @@ fi
 
 %files common
 %defattr(644,root,root,755)
-%doc CREDITS EXTENSIONS LICENSE NEWS UPGRADING* Zend/{LICENSE.Zend,README*} php.ini-* .gdbinit
+%doc EXTENSIONS LICENSE NEWS UPGRADING* Zend/{LICENSE.Zend,README*} php.ini-* .gdbinit
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
@@ -3020,7 +2895,7 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%doc CODING_STANDARDS README.{EXT_SKEL,PARAMETER_PARSING_API,SELF-CONTAINED-EXTENSIONS,STREAMS,SUBMITTING_PATCH,TESTING,UNIX-BUILD-SYSTEM,input_filter}
+%doc CODING_STANDARDS.md docs/*.md
 %attr(755,root,root) %{_bindir}/ext_skel.php
 %attr(755,root,root) %{_bindir}/php-config
 %attr(755,root,root) %{_bindir}/phpize
@@ -3073,7 +2948,7 @@ fi
 %if %{with dba}
 %files dba
 %defattr(644,root,root,755)
-%doc ext/dba/{CREDITS,README}
+%doc ext/dba/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dba.ini
 %attr(755,root,root) %{php_extensiondir}/dba.so
 %endif
@@ -3102,6 +2977,14 @@ fi
 %attr(755,root,root) %{php_extensiondir}/exif.so
 %endif
 
+%if %{with ffi}
+%files ffi
+%defattr(644,root,root,755)
+%doc ext/ffi/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ffi.ini
+%attr(755,root,root) %{php_extensiondir}/ffi.so
+%endif
+
 %if %{with fileinfo}
 %files fileinfo
 %defattr(644,root,root,755)
@@ -3150,14 +3033,6 @@ fi
 %attr(755,root,root) %{php_extensiondir}/gmp.so
 %endif
 
-%if %{with hash}
-%files hash
-%defattr(644,root,root,755)
-%doc ext/hash/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/Hash.ini
-%attr(755,root,root) %{php_extensiondir}/hash.so
-%endif
-
 %if %{with iconv}
 %files iconv
 %defattr(644,root,root,755)
@@ -3174,14 +3049,6 @@ fi
 %attr(755,root,root) %{php_extensiondir}/imap.so
 %endif
 
-%if %{with interbase}
-%files interbase
-%defattr(644,root,root,755)
-%doc ext/interbase/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/interbase.ini
-%attr(755,root,root) %{php_extensiondir}/interbase.so
-%endif
-
 %if %{with intl}
 %files intl
 %defattr(644,root,root,755)
@@ -3249,7 +3116,6 @@ fi
 %if %{with opcache}
 %files opcache
 %defattr(644,root,root,755)
-%doc ext/opcache/README
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/opcache.ini
 %attr(755,root,root) %{php_extensiondir}/opcache.so
 %endif
@@ -3257,7 +3123,7 @@ fi
 %if %{with openssl}
 %files openssl
 %defattr(644,root,root,755)
-%doc ext/openssl/{CREDITS,README}
+%doc ext/openssl/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/openssl.ini
 %attr(755,root,root) %{php_extensiondir}/openssl.so
 %endif
@@ -3265,23 +3131,15 @@ fi
 %if %{with pcntl}
 %files pcntl
 %defattr(644,root,root,755)
-%doc ext/pcntl/{CREDITS,README}
+%doc ext/pcntl/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pcntl.ini
 %attr(755,root,root) %{php_extensiondir}/pcntl.so
 %endif
 
-%if %{with pcre}
-%files pcre
-%defattr(644,root,root,755)
-%doc ext/pcre/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/PCRE.ini
-%attr(755,root,root) %{php_extensiondir}/pcre.so
-%endif
-
 %if %{with pdo}
 %files pdo
 %defattr(644,root,root,755)
-%doc ext/pdo/{CREDITS,README}
+%doc ext/pdo/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo.ini
 %attr(755,root,root) %{php_extensiondir}/pdo.so
 %endif
@@ -3289,7 +3147,7 @@ fi
 %if %{with pdo_dblib}
 %files pdo-dblib
 %defattr(644,root,root,755)
-%doc ext/pdo_dblib/{CREDITS,README}
+%doc ext/pdo_dblib/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_dblib.ini
 %attr(755,root,root) %{php_extensiondir}/pdo_dblib.so
 %endif
@@ -3345,7 +3203,7 @@ fi
 %if %{with pgsql}
 %files pgsql
 %defattr(644,root,root,755)
-%doc ext/pgsql/{CREDITS,README}
+%doc ext/pgsql/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pgsql.ini
 %attr(755,root,root) %{php_extensiondir}/pgsql.so
 %endif
@@ -3378,7 +3236,6 @@ fi
 %if %{with pspell}
 %files pspell
 %defattr(644,root,root,755)
-%doc ext/pspell/{CREDITS,README}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pspell.ini
 %attr(755,root,root) %{php_extensiondir}/pspell.so
 %endif
@@ -3386,7 +3243,7 @@ fi
 %if %{with readline}
 %files readline
 %defattr(644,root,root,755)
-%doc ext/readline/{CREDITS,README*}
+%doc ext/readline/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/readline.ini
 %attr(755,root,root) %{php_extensiondir}/readline.so
 %endif
@@ -3410,13 +3267,13 @@ fi
 
 %files shmop
 %defattr(644,root,root,755)
-%doc ext/shmop/{CREDITS,README}
+%doc ext/shmop/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/shmop.ini
 %attr(755,root,root) %{php_extensiondir}/shmop.so
 
 %files simplexml
 %defattr(644,root,root,755)
-%doc ext/simplexml/{CREDITS,README}
+%doc ext/simplexml/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/simplexml.ini
 %attr(755,root,root) %{php_extensiondir}/simplexml.so
 
@@ -3448,13 +3305,6 @@ fi
 %attr(755,root,root) %{php_extensiondir}/sodium.so
 %endif
 
-%files spl
-%defattr(644,root,root,755)
-%doc ext/spl/{CREDITS,README}
-%doc ext/spl/examples
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/SPL.ini
-%attr(755,root,root) %{php_extensiondir}/spl.so
-
 %if %{with sqlite3}
 %files sqlite3
 %defattr(644,root,root,755)
@@ -3518,7 +3368,7 @@ fi
 
 %files xmlreader
 %defattr(644,root,root,755)
-%doc ext/xmlreader/{CREDITS,README}
+%doc ext/xmlreader/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlreader.ini
 %attr(755,root,root) %{php_extensiondir}/xmlreader.so