X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=inline;f=php.spec;h=5e1227d5577b3f9bb87349ad65b9d13fb050b57b;hb=93885131ab5e2f8657647b07c4b83487e83f3c2e;hp=d12d02df3abdeffc20cfc0a02ed81041e3d2ffbb;hpb=46bd0dc461bcd4546603f6360c1e93bf7d2c3d19;p=packages%2Fphp.git
diff --git a/php.spec b/php.spec
index d12d02d..5e1227d 100644
--- a/php.spec
+++ b/php.spec
@@ -1,49 +1,21 @@
-# NOTES
-# - mysqlnd driver doesn't support reconnect: https://bugs.php.net/bug.php?id=52561
-# 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)
-# --with-libmbfl=DIR MBSTRING: Use external libmbfl. DIR is the libmbfl base install directory BUNDLED
-# 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
-# - wddx: restore session support (not compiled in due DL extension check)
-# - modularize standard (output from pure php -m)?
-# - some mods should be shared:
-#$ php -m
-# [PHP Modules]
-# Core
-# date
-# libxml
-# Reflection
-# standard
-#
# Conditional build:
# - General options:
-%bcond_without embed # disable building Embedded API
+%bcond_with embed # disable building Embedded API
%bcond_with gcov # Enable Code coverage reporting
%bcond_without kerberos5 # without Kerberos5 support
-%bcond_with suhosin # with suhosin patch, has little point in PHP>=5.3, see https://github.com/stefanesser/suhosin/issues/42#issuecomment-41728178
%bcond_with systemtap # systemtap/DTrace support
%bcond_with tests # default off; test process very often hangs on builders, approx run time 45m; perform "make test"
%bcond_with zts # Zend Thread Safety
+%bcond_with debug # Zend Debug Build
# - SAPI
%bcond_without apache2 # disable building Apache 2.x SAPI
%bcond_without cgi # disable CGI/FCGI SAPI
%bcond_without fpm # disable FPM SAPI
%bcond_without litespeed # build litespeed SAPI
-%bcond_with milter # disable Milter SAPI
%bcond_without phpdbg # disable phpdbg SAPI
# - Extensions
%bcond_without bcmath # without bcmath extension module
-%bcond_without bz2 # without bz2 extension module
+%bcond_without bzip2 # without bz2 extension module
%bcond_without calendar # without calendar extension module
%bcond_without ctype # without ctype extension module
%bcond_without curl # without CURL extension module
@@ -51,18 +23,16 @@
%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_with imap # without IMAP extension module
%bcond_without intl # without Intl extension module
-%bcond_without json # without json extension module
%bcond_without ldap # without LDAP extension module
%bcond_without mbstring # without mbstring extension module
%bcond_without mhash # without mhash extension (supported by hash extension)
@@ -73,36 +43,37 @@
%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
%bcond_without pdo_mysql # without PDO MySQL extension module
+%bcond_without pdo_oci # without PDO oci extension module
+%bcond_without pdo_odbc # without PDO ODBC extension module
+%bcond_without pdo_pgsql # without PDO pgsql extension module
%bcond_without pdo_sqlite # without PDO SQLite extension module
%bcond_without pgsql # without PostgreSQL extension module
%bcond_without phar # without Phar extension module
%bcond_without posix # without POSIX extension module
%bcond_without pspell # without pspell extension module
%bcond_without readline # without readline extension module
-%bcond_without recode # without recode extension module
%bcond_without session # without session extension module
%bcond_without snmp # without SNMP extension module
%bcond_without sodium # without sodium extension module
%bcond_without sqlite2 # without SQLite extension module
%bcond_without sqlite3 # without SQLite3 extension module
%bcond_without tidy # without Tidy extension module
-%bcond_without wddx # without WDDX extension module
-%bcond_without xmlrpc # without XML-RPC extension module
-%bcond_without xsl # without xsl extension module
+%bcond_without xsl # without xsl extension module
+%bcond_without zip # without zip extension module
# extensions options
%bcond_without argon2 # argon2 password hashing
%bcond_without instantclient # build Oracle oci8 extension module against oracle-instantclient package
%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs)
%bcond_with mm # without mm support for session storage
%bcond_without system_gd # system gd
-%bcond_without system_libzip # system libzip
+%bcond_with avif # Without AVIF support in GD extension (imagecreatefromavif and imageavif)
%bcond_without webp # Without WebP support in GD extension (imagecreatefromwebp)
-%define apxs1 /usr/sbin/apxs1
%define apxs2 /usr/sbin/apxs
# disable all sapis
@@ -117,14 +88,16 @@
%undefine with_mm
%endif
-# milter requires ZTS
-%if %{with milter} && %{without zts}
-%undefine with_milter
+%if %{without odbc}
+%undefine with_pdo_odbc
+%endif
+
+%if %{without pgsql}
+%undefine with_pdo_pgsql
%endif
-%ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha
-# ppc disabled (broken on th-ppc)
-%undefine with_interbase
+%if %{without oci}
+%undefine with_pdo_oci
%endif
%ifnarch %{ix86} %{x8664} x32
@@ -132,30 +105,35 @@
%undefine with_fpm
%endif
-# filter depends on pcre
-%if %{without pcre}
-%undefine with_filter
+%if %{without pdo}
+%undefine with_pdo_dblib
+%undefine with_pdo_firebird
+%undefine with_pdo_mysql
+%undefine with_pdo_oci
+%undefine with_pdo_odbc
+%undefine with_pdo_pgsql
+%undefine with_pdo_sqlite
%endif
%define orgname php
-%define php_suffix 72
+%define php_suffix 81
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): JÄzyk skryptowy PHP
Summary(pt_BR.UTF-8): A linguagem de script PHP
-Summary(ru.UTF-8): PHP ÐеÑÑии 7 - ÑзÑк пÑепÑоÑеÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ HTML-Ñайлов, вÑполнÑемÑй на ÑеÑвеÑе
-Summary(uk.UTF-8): PHP ÐеÑÑÑÑ 7 - мова пÑепÑоÑеÑÑÐ²Ð°Ð½Ð½Ñ HTML-ÑайлÑв, виконÑвана на ÑеÑвеÑÑ
+Summary(ru.UTF-8): PHP - ÑзÑк пÑепÑоÑеÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ HTML-Ñайлов, вÑполнÑемÑй на ÑеÑвеÑе
+Summary(uk.UTF-8): PHP - мова пÑепÑоÑеÑÑÐ²Ð°Ð½Ð½Ñ HTML-ÑайлÑв, виконÑвана на ÑеÑвеÑÑ
Name: %{orgname}%{php_suffix}
-Version: 7.2.9
-Release: 4
+Version: 8.1.27
+Release: 1
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
License: PHP 3.01 and Zend and BSD
Group: Libraries
-Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: d529efc4017840e3db970b0bc25aef9c
+Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz
+# Source0-md5: 827ea356c632a105596915b40b570ac0
Source1: opcache.ini
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
@@ -170,62 +148,45 @@ Patch0: %{orgname}-shared.patch
Patch1: %{orgname}-tld.patch
Patch3: %{orgname}-link-libs.patch
Patch4: intl-stdc++.patch
-Patch5: %{orgname}-filter-shared.patch
-Patch6: %{orgname}-build_modules.patch
+# https://bugs.php.net/bug.php?id=79589
+Patch5: openssl.patch
Patch7: %{orgname}-sapi-ini-file.patch
-Patch8: milter.patch
-Patch9: libtool-tag.patch
Patch10: %{orgname}-ini.patch
Patch11: embed.patch
Patch14: %{orgname}-no_pear_install.patch
-Patch17: %{orgname}-readline.patch
Patch18: %{orgname}-nohttpd.patch
Patch21: %{orgname}-dba-link.patch
Patch22: %{orgname}-both-apxs.patch
Patch23: %{orgname}-paths.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
-Patch37: %{orgname}-mysqli-charsetphpini.patch
-Patch38: %{orgname}-pdo_mysql-charsetphpini.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
-Patch47: suhosin.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
+Patch60: %{orgname}-oracle-instantclient.patch
Patch66: php-db.patch
Patch67: mysql-lib-ver-mismatch.patch
-Patch69: fpm-conf-split.patch
-Patch70: mysqlnd-ssl.patch
+# https://bugs.php.net/bug.php?id=68344
+Patch68: php-mysql-ssl-context.patch
Patch71: libdb-info.patch
-Patch72: phar-hash-shared.patch
-Patch73: revert-mysql-8-auth-fix.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
-BuildRequires: bison
+BuildRequires: bison >= 3.0.0
BuildRequires: bzip2-devel >= 1.0.0
-%{?with_curl:BuildRequires: curl-devel >= 7.12.0}
+%{?with_curl:BuildRequires: curl-devel >= 7.15.5}
BuildRequires: cyrus-sasl-devel >= 2
BuildRequires: db-devel >= 4.0
BuildRequires: elfutils-devel
%{?with_enchant:BuildRequires: enchant-devel >= 1.1.3}
-%{?with_kerberos5:BuildRequires: heimdal-devel}
-%{?with_argon2:BuildRequires: libargon2-devel >= 20161029}
-%{?with_sodium:BuildRequires: libsodium-devel >= 1.0.8}
%if %{with pdo_dblib}
BuildRequires: freetds-devel >= 0.82
%endif
@@ -235,49 +196,52 @@ BuildRequires: gd-devel >= 2.1
%endif
BuildRequires: gdbm-devel
BuildRequires: gmp-devel >= 4.2
+%{?with_kerberos5:BuildRequires: heimdal-devel}
%{?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_argon2:BuildRequires: libargon2-devel >= 20161029}
+%{?with_avif:BuildRequires: libavif-devel >= 0.8.2}
+%{?with_ffi:BuildRequires: libffi-devel}
+%{?with_intl:BuildRequires: libicu-devel >= 50.1}
BuildRequires: libjpeg-devel
BuildRequires: libltdl-devel >= 1.4
BuildRequires: libpng-devel >= 1.0.8
+%{?with_sodium:BuildRequires: libsodium-devel >= 1.0.8}
%{?with_intl:BuildRequires: libstdc++-devel}
-%{?with_webp:BuildRequires: libwebp-devel}
BuildRequires: libtool >= 2:2.4.6
+%{?with_webp:BuildRequires: libwebp-devel >= 0.2.0}
BuildRequires: libxml2-devel >= 1:2.7.6-4
%{?with_xsl:BuildRequires: libxslt-devel >= 1.1.0}
-%{?with_system_libzip:BuildRequires: libzip-devel >= 1.2.0}
+%{?with_zip:BuildRequires: libzip-devel >= 1.3.1}
%{?with_snmp:%{?with_tests:BuildRequires: mibs-net-snmp}}
%{?with_mm:BuildRequires: mm-devel >= 1.3.0}
+%{!?with_mysqli:BuildRequires: mysql-devel}
%{!?with_pdo_mysql:BuildRequires: mysql-devel}
-%{!?with_mysqli:BuildRequires: mysql-devel >= 4.1.13}
%{?with_snmp:BuildRequires: net-snmp-devel >= 5.3}
-BuildRequires: oniguruma-devel
+BuildRequires: oniguruma-devel
%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
%if %{with openssl} || %{with ldap}
-BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: openssl-devel >= 1.0.2
%endif
%{?with_oci:%{?with_instantclient:BuildRequires: oracle-instantclient-devel}}
BuildRequires: pam-devel
-%{?with_pcre:BuildRequires: pcre-devel >= 8.10}
+BuildRequires: pcre2-8-devel >= 10.30
BuildRequires: pkgconfig
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: readline-devel
-%{?with_recode:BuildRequires: recode-devel >= 3.5d-3}
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-build >= 4.4.0
BuildRequires: rpmbuild(macros) >= 1.566
BuildRequires: sed >= 4.0
%if %{with sqlite3} || %{with pdo_sqlite}
-BuildRequires: sqlite3-devel >= 3.3.9
+BuildRequires: sqlite3-devel >= 3.7.7
%endif
%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
BuildRequires: tar >= 1:1.22
%{?with_tidy:BuildRequires: tidy-devel}
BuildRequires: tokyocabinet-devel
%{?with_odbc:BuildRequires: unixODBC-devel}
-%{?with_xmlrpc:BuildRequires: xmlrpc-epi-devel >= 0.54.1}
BuildRequires: xz
BuildRequires: zlib-devel >= 1.2.0.4
%if %{with apache2}
@@ -288,31 +252,31 @@ BuildRequires: apr-util-devel >= 1:1.0.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define php_sysconfdir /etc/%{name}
-%define php_extensiondir %{_libdir}/%{name}
-%define php_datadir /usr/share/php/%{name}
+%define php_extensiondir %{_libdir}/php/%{name}
+%define php_data_dir /usr/share/php/%{name}
%define _sysconfdir %{php_sysconfdir}
# must be in sync with source. extra check ensuring that it is so is done in %%build
-%define php_api_version 20170718
-%define zend_module_api 20170718
-%define zend_extension_api 320170718
+%define php_api_version 20210902
+%define zend_module_api 20210902
+%define zend_extension_api 420210902
%define php_pdo_api_version 20170320
# Extension versions
-%define bz2ver 1.0
+%define bz2ver %{version}
%define enchantver %{version}
-%define fileinfover 1.0.5
-%define hashver 1.0
-%define intlver 1.1.0
-%define jsonver 1.6.0
-%define pharver 2.0.2
+%define fileinfover %{version}
+%define hashver %{version}
+%define intlver %{version}
+%define jsonver %{version}
+%define pharver %{version}
%define sqlite3ver %{version}
-%define zipver 1.15.3
-%define phpdbgver 0.5.0
+%define zipver 1.19.5
+%define phpdbgver %{version}
%define sodiumver %{version}
%define _zend_zts %{!?with_zts:0}%{?with_zts:1}
-%define php_debug %{!?debug:0}%{?debug:1}
+%define php_debug %{!?with_debug:0}%{?with_debug:1}
%if %{with gcov}
%undefine with_ccache
@@ -377,20 +341,33 @@ PHP - Ñе мова напиÑÐ°Ð½Ð½Ñ ÑкÑипÑÑв, Ñо вбÑдовÑÑÑ
викоÑиÑÑÐ°Ð½Ð½Ñ PHP - замÑна Ð´Ð»Ñ CGI ÑкÑипÑÑв.
%package -n apache-mod_%{name}
-Summary: PHP DSO module for Apache 2.x
-Summary(pl.UTF-8): ModuÅ DSO (Dynamic Shared Object) PHP dla Apache 2.x
+Summary: PHP support for Apache 2.x
+Summary(pl.UTF-8): Wsparcie PHP dla Apache 2.x
Group: Development/Languages/PHP
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: apache(modules-api) = %{apache_modules_api}
-Requires: apache-mod_mime
+Requires: apache-mod_%{name}-core = %{epoch}:%{version}-%{release}
Provides: webserver(php) = %{version}
Obsoletes: apache-mod_php < 4:5.3.28-7
Obsoletes: phpfi
%description -n apache-mod_%{name}
-PHP as DSO module for Apache 2.x.
+PHP support for Apache 2.x.
%description -n apache-mod_%{name} -l pl.UTF-8
+Wsparcie PHP dla Apache 2.x.
+
+%package -n apache-mod_%{name}-core
+Summary: PHP DSO module for Apache 2.x
+Summary(pl.UTF-8): 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-mod_mime
+
+%description -n apache-mod_%{name}-core
+PHP as DSO module for Apache 2.x.
+
+%description -n apache-mod_%{name}-core -l pl.UTF-8
PHP jako moduÅ DSO (Dynamic Shared Object) dla Apache 2.x.
%package litespeed
@@ -527,28 +504,43 @@ 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(json)
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 pcre pcre-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.
@@ -572,10 +564,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
+Requires: autoconf >= 2.59
+Requires: automake >= 1.4d
Requires: libtool >= 2:2.4.6
-%{?with_pcre:Requires: pcre-devel >= 8.10}
+Requires: pcre2-8-devel >= 10.30
Requires: shtool
Provides: php-devel = %{epoch}:%{version}-%{release}
Obsoletes: php-pear-devel
@@ -584,6 +576,7 @@ Obsoletes: php52-devel
Obsoletes: php53-devel
Obsoletes: php54-devel
Obsoletes: php55-devel
+Obsoletes: php56-devel
%description devel
The php-devel package lets you compile dynamic extensions to PHP.
@@ -790,6 +783,22 @@ 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: Foreign Function Interface module for PHP
+Summary(pl.UTF-8): ModuÅ Foreign Function Interface (interfejsu do obcych jÄzyków) dla PHP
+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.
+
+%description ffi -l pl.UTF-8
+FFI to wieloplatformowe rozszerzenie dla PHP pozwalajÄ
ce dowiÄ
zywaÄ
+funkcje z dowolnych bibliotek wspóÅdzielonych i wywoÅywaÄ je.
+
%package fileinfo
Summary: libmagic bindings
Summary(pl.UTF-8): WiÄ
zania do libmagic
@@ -913,29 +922,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
@@ -976,26 +962,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)
@@ -1018,24 +984,6 @@ interfejsem do biblioteki ICU, pozwalajÄ
cym programistom PHP na
wykonywanie w skryptach porównaŠzgodnych z UCA oraz formatowania
daty/czasu/walut.
-%package json
-Summary: PHP C extension for JSON serialization
-Summary(pl.UTF-8): Rozszerzenie C PHP dla serializacji JSON
-Group: Libraries
-URL: http://php.net/manual/en/book.json.php
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: php(json) = %{jsonver}
-Obsoletes: php-json < 4:5.3.28-7
-Obsoletes: php-pecl-json < %{jsonver}
-
-%description json
-php-json is an extremely fast PHP C extension for JSON (JavaScript
-Object Notation) serialisation.
-
-%description json -l pl.UTF-8
-php-json to bardzo szybkie rozszerzenie C PHP dla serializacji JSON
-(JavaScript Object Notation).
-
%package ldap
Summary: LDAP extension module for PHP
Summary(pl.UTF-8): ModuÅ LDAP dla PHP
@@ -1080,7 +1028,7 @@ URL: http://php.net/manual/en/book.mysqli.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%{?with_mysqlnd:Requires: %{name}-mysqlnd = %{epoch}:%{version}-%{release}}
Requires: %{name}-spl = %{epoch}:%{version}-%{release}
-Requires: mysql-libs >= 4.1.13
+Requires: mysql-libs
Provides: php(mysqli)
Obsoletes: php-mysqli < 4:5.3.28-7
@@ -1231,22 +1179,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)
@@ -1498,24 +1430,6 @@ cgi SAPIs).
%description readline -l pl.UTF-8
ModuÅ PHP dodajÄ
cy obsÅugÄ funkcji readline (tylko do SAPI cli i cgi).
-%package recode
-Summary: recode extension module for PHP
-Summary(pl.UTF-8): ModuÅ recode dla PHP
-Group: Libraries
-URL: http://php.net/manual/en/book.recode.php
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: recode >= 3.5d-3
-Provides: php(recode)
-Obsoletes: php-recode < 4:5.3.28-7
-
-%description recode
-This is a dynamic shared object (DSO) for PHP that will add recode
-support.
-
-%description recode -l pl.UTF-8
-ModuÅ PHP dodajÄ
cy możliwoÅÄ konwersji kodowania plików (poprzez
-bibliotekÄ recode).
-
%package session
Summary: session extension module for PHP
Summary(pl.UTF-8): ModuÅ session dla PHP
@@ -1619,6 +1533,7 @@ ModuÅ PHP dodajÄ
cy obsÅugÄ gniazdek.
%package sodium
Summary: Wrapper for the Sodium cryptographic library
+Summary(pl.UTF-8): Interfejs do biblioteki kryptograficznej Sodium
Group: Libraries
URL: https://paragonie.com/book/pecl-libsodium
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -1627,23 +1542,8 @@ 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).
+%description sodium -l pl.UTF-8
+Proste, niskopoziomowe rozszerzenie PHP wykorzystujÄ
c libsodium.
%package sqlite3
Summary: SQLite3 extension module for PHP
@@ -1728,6 +1628,7 @@ Summary(pl.UTF-8): Zawiera pliki testów jednostkowych dla PHP i rozszerzeÅ
Group: Libraries
URL: http://qa.php.net/
Requires: %{name}-cli
+BuildArch: noarch
%description tests
This package contains unit tests for PHP and its extensions.
@@ -1768,27 +1669,6 @@ support.
%description tokenizer -l pl.UTF-8
ModuÅ PHP dodajÄ
cy obsÅugÄ tokenizera do PHP.
-%package wddx
-Summary: wddx extension module for PHP
-Summary(pl.UTF-8): ModuÅ wddx dla PHP
-Group: Libraries
-URL: http://php.net/manual/en/book.wddx.php
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-# - wddx doesn't require session as it's disabled at compile time:
-# if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
-# see also php.spec#rev1.120.2.22
-#Requires: %{name}-session = %{epoch}:%{version}-%{release}
-Requires: %{name}-xml = %{epoch}:%{version}-%{release}
-Provides: php(wddx)
-Obsoletes: php-wddx < 4:5.3.28-7
-
-%description wddx
-This is a dynamic shared object (DSO) for PHP that will add wddx
-support.
-
-%description wddx -l pl.UTF-8
-ModuÅ PHP umożliwiajÄ
cy korzystanie z wddx.
-
%package xml
Summary: XML extension module for PHP
Summary(pl.UTF-8): ModuÅ XML dla PHP
@@ -1829,23 +1709,6 @@ ModuÅ PHP umożliwiajÄ
cy analizÄ plików XML w trybie Pull. Czytnik
dziaÅa jako kursor przechodzÄ
cy przez strumieÅ dokumentu i
zatrzymujÄ
cy siÄ na każdym wÄźle po drodze.
-%package xmlrpc
-Summary: xmlrpc extension module for PHP
-Summary(pl.UTF-8): ModuÅ xmlrpc dla PHP
-Group: Libraries
-URL: http://php.net/manual/en/book.xmlrpc.php
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-xml = %{epoch}:%{version}-%{release}
-Provides: php(xmlrpc)
-Obsoletes: php-xmlrpc < 4:5.3.28-7
-
-%description xmlrpc
-This is a dynamic shared object (DSO) for PHP that will add XMLRPC
-support.
-
-%description xmlrpc -l pl.UTF-8
-ModuÅ PHP dodajÄ
cy obsÅugÄ XMLRPC.
-
%package xmlwriter
Summary: Fast, non-cached, forward-only means to write XML data
Summary(pl.UTF-8): Szybka, nie cachowana metoda zapisu danych w formacie XML
@@ -1892,7 +1755,7 @@ Summary(pl.UTF-8): ZarzÄ
dzanie archiwami zip
Group: Libraries
URL: http://php.net/manual/en/book.zip.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-%{?with_system_libzip:Requires: libzip >= 1.2.0}
+Requires: libzip >= 1.3.1
Provides: php(zip) = %{zipver}
Obsoletes: php-pecl-zip < %{zipver}
Obsoletes: php-zip < 4:5.3.28-7
@@ -1921,57 +1784,44 @@ compression support to PHP.
ModuÅ PHP umożliwiajÄ
cy używanie kompresji zlib.
%prep
-%setup -q -n %{orgname}-%{version}
+%setup -q -n %{orgname}-%{version}%{?subver}
+
cp -p php.ini-production php.ini
%patch0 -p1
%patch1 -p1
%patch3 -p1
+%patch4 -p1
%patch5 -p1
-%patch6 -p1
+
%patch7 -p1
-%{?with_milter:%patch8 -p1}
-%patch9 -p1
%patch10 -p1
%patch14 -p1
-%patch17 -p1
%patch18 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
-%patch26 -p1
%patch27 -p1
%patch29 -p1
-%patch31 -p1
-%patch34 -p1
-%patch37 -p1
-%patch38 -p1
%patch39 -p1
-%if %{with fpm}
%patch41 -p1
-%patch42 -p1
-%endif
%patch43 -p1
%patch44 -p1
-%if %{with suhosin}
-%patch47 -p1
-%endif
%patch50 -p1
-%patch51 -p1 -b .spl-shared
-%patch52 -p1 -b .pcre-shared
%patch53 -p1
-%undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
-%patch55 -p1
-%patch59 -p1 -b .systzdata
+%patch59 -p1
+%if %{with instantclient}
+%patch60 -p1
+%endif
%patch66 -p1
%patch67 -p1
-%patch70 -p1
+#%patch68 -p1 DROP or update to 7.0 APIs
%patch71 -p1
-%patch72 -p1 -b .phar-shared
-%patch73 -p1
-%{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{_bindir}/\1%{php_suffix},' \
+ ext/ext_skel.php \
+ run-tests.php
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -1979,11 +1829,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
# com_dotnet is Win32-only
%{__rm} -r ext/com_dotnet
-# conflict seems to be resolved by recode patches
-%{__rm} ext/recode/config9.m4
-
# remove all bundled libraries not to link with them accidentally
-%{__rm} -r ext/sqlite3/libsqlite
#%{__rm} -r ext/bcmath/libbcmath
#%{__rm} -r ext/date/lib
#%{__rm} -r ext/fileinfo/libmagic
@@ -1992,10 +1838,8 @@ 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/mbstring/oniguruma
-%{__rm} -r ext/pcre/pcrelib
+#%{__rm} -r ext/pcre/pcre2lib
#%{__rm} -r ext/soap/interop
-%{__rm} -r ext/xmlrpc/libxmlrpc
#%{__rm} -r ext/zip/lib
%{__rm} ext/date/lib/timezonedb.h
@@ -2073,6 +1917,11 @@ ix86=: x8664=: \
sh -xe %{_sourcedir}/skip-tests.sh
%build
+get_version() {
+ local define="$1" filename="$2"
+ awk -vdefine="$define" '/#define/ && $2 == define {print $3}' "$filename" | xargs
+}
+
API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
if [ $API != %{php_api_version} ]; then
echo "Set %%define php_api_version to $API and re-run."
@@ -2098,20 +1947,22 @@ if [ $API != %{php_pdo_api_version} ]; then
fi
# Check for some extension version
-ver=$(sed -n '/#define PHP_FILEINFO_VERSION /{s/.* "//;s/".*$//;p}' ext/fileinfo/php_fileinfo.h)
-if test "$ver" != "%{fileinfover}"; then
+ver=$(awk '/#define PHP_FILEINFO_VERSION/ {print $3}' ext/fileinfo/php_fileinfo.h | xargs)
+if test "$ver" != "PHP_VERSION"; then
: Error: Upstream FILEINFO version is now ${ver}, expecting %{fileinfover}.
: Update the fileinfover macro and rebuild.
exit 1
fi
-ver=$(sed -n '/#define PHP_PHAR_VERSION /{s/.* "//;s/".*$//;p}' ext/phar/php_phar.h)
-if test "$ver" != "%{pharver}"; then
+ver=$(get_version PHP_PHAR_VERSION ext/phar/php_phar.h)
+if test "$ver" != "PHP_VERSION"; then
: Error: Upstream PHAR version is now ${ver}, expecting %{pharver}.
: Update the pharver macro and rebuild.
exit 1
fi
ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs)
if test "$ver" != "PHP_VERSION"; then
+ : Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
+ : Update the sqlite3ver macro and rebuild.
exit 1
fi
ver=$(awk '/#define PHP_SODIUM_VERSION/ {print $3}' ext/sodium/php_libsodium.h | xargs)
@@ -2124,20 +1975,20 @@ if test "$ver" != "%{zipver}"; then
: Update the zipver macro and rebuild.
exit 1
fi
-ver=$(sed -n '/#define PHP_JSON_VERSION /{s/.* "//;s/".*$//;p}' ext/json/php_json.h)
-if test "$ver" != "%{jsonver}"; then
+ver=$(get_version PHP_JSON_VERSION ext/json/php_json.h)
+if test "$ver" != "PHP_VERSION"; then
: Error: Upstream JSON version is now ${ver}, expecting %{jsonver}.
: Update the jsonver macro and rebuild.
exit 1
fi
-ver=$(sed -n '/#define PHPDBG_VERSION /{s/.* "//;s/".*$//;p}' sapi/phpdbg/phpdbg.h)
-if test "$ver" != "%{phpdbgver}"; then
+ver=$(get_version PHPDBG_VERSION sapi/phpdbg/phpdbg.h)
+if test "$ver" != "PHP_VERSION"; then
: Error: Upstream phpdbg version is now ${ver}, expecting %{phpdbgver}.
: Update the phpdbgver macro and rebuild.
exit 1
fi
-ver=$(sed -rne 's,.*(.+),\1,p' ext/bz2/package.xml)
-if test "$ver" != "%{bz2ver}"; then
+ver=$(get_version PHP_BZ2_VERSION ext/bz2/php_bz2.h)
+if test "$ver" != "PHP_VERSION"; then
: Error: Upstream BZIP2 version is now ${ver}, expecting %{bz2ver}.
: Update the bz2ver macro and rebuild.
exit 1
@@ -2146,33 +1997,52 @@ ver=$(awk '/#define PHP_ENCHANT_VERSION/ {print $3}' ext/enchant/php_enchant.h |
if test "$ver" != "PHP_VERSION"; then
exit 1
fi
-ver=$(awk '/#define PHP_HASH_VERSION/ {print $3}' ext/hash/php_hash.h | xargs)
-if test "$ver" != "%{hashver}"; then
+ver=$(get_version PHP_HASH_VERSION ext/hash/php_hash.h)
+if test "$ver" != "PHP_VERSION"; then
: Error: Upstream HASH version is now ${ver}, expecting %{hashver}.
: Update the hashver macro and rebuild.
exit 1
fi
-ver=$(sed -n '/#define PHP_INTL_VERSION /{s/.* "//;s/".*$//;p}' ext/intl/php_intl.h)
-if test "$ver" != "%{intlver}"; then
+ver=$(get_version PHP_INTL_VERSION ext/intl/php_intl.h)
+if test "$ver" != "PHP_VERSION"; then
: Error: Upstream Intl version is now ${ver}, expecting %{intlver}.
: Update the intlver macro and rebuild.
exit 1
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
- rm -f Makefile.{cgi-fcgi,fpm,cli,apxs1,apxs2,litespeed,phpdbg,milter}
+ rm -f Makefile.{cgi-fcgi,fpm,cli,apxs2,litespeed,phpdbg}
+
+ # Force use of system libtool:
+ mv build/libtool.m4 build/libtool.m4.saved
+ cat %{_aclocaldir}/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 > build/libtool.m4
%{__libtoolize}
%{__aclocal}
+
cp -f /usr/share/automake/config.* .
./buildconf --force
touch _built-conf
fi
export PROG_SENDMAIL="/usr/lib/sendmail"
-export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags} \
- -I%{_includedir}/xmlrpc-epi"
+export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags}"
+
+# This should be detected by configure and set there,
+# but looks like the build system is hosed on 7.3
+export CXXFLAGS="%{rpmcxxflags} -fPIC -DPIC"
+export CFLAGS="%{rpmcflags} -fPIC -DPIC"
+
+%if %{with intl}
+# icu 59+ C++ API requires C++ >= 11
+CXXFLAGS="$CXXFLAGS -std=c++11"
+%endif
sapis="
cli
@@ -2194,9 +2064,6 @@ apxs2
%if %{with phpdbg}
phpdbg
%endif
-%if %{with milter}
-milter
-%endif
"
for sapi in $sapis; do
: SAPI $sapi
@@ -2206,48 +2073,48 @@ for sapi in $sapis; do
sapi_args=''
case $sapi in
cgi-fcgi)
- sapi_args='--disable-cli'
+ sapi_args='--enable-cgi'
;;
cli)
- sapi_args='--disable-cgi %{?with_gcov:--enable-gcov}'
+ sapi_args='--enable-cli %{?with_gcov:--enable-gcov}'
;;
fpm)
- sapi_args='--disable-cli --disable-cgi --enable-fpm'
+ sapi_args='--enable-fpm'
;;
embed)
- sapi_args='--disable-cli --disable-cgi --enable-embed'
+ sapi_args='--enable-embed'
;;
apxs2)
ver=$(rpm -q --qf '%{V}' apache-devel)
- sapi_args="--disable-cli --disable-cgi --with-apxs2=%{apxs2} --with-apache-version=$ver"
+ sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver"
;;
litespeed)
- sapi_args='--disable-cli --disable-cgi --with-litespeed'
+ sapi_args='--enable-litespeed'
;;
phpdbg)
- sapi_args='--disable-cli --disable-cgi --enable-phpdbg %{?debug:--enable-phpdbg-debug}'
- ;;
- milter)
- sapi_args='--disable-cli --disable-cgi --with-milter'
+ sapi_args='--enable-phpdbg %{?debug:--enable-phpdbg-debug}'
;;
esac
%configure \
EXTRA_LDFLAGS="%{rpmldflags}" \
--program-suffix=%{php_suffix} \
+ --disable-cgi \
+ --disable-cli \
+ --disable-phpdbg \
$sapi_args \
%if "%{!?configure_cache:0}%{?configure_cache}" == "0"
--cache-file=config.cache \
%endif
- --datadir=%{php_datadir} \
+ --datadir=%{php_data_dir} \
--with-libdir=%{_lib} \
--with-config-file-path=%{_sysconfdir} \
--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
--with-system-tzdata \
%{?with_argon2:--with-password-argon2} \
- --%{!?debug:dis}%{?debug:en}able-debug \
+ --%{!?with_debug:dis}%{?with_debug:en}able-debug \
%{?with_zts:--enable-maintainer-zts} \
- --enable-inline-optimization \
+ --enable-option-checking=fatal \
%{__enable_disable bcmath bcmath shared} \
%{__enable_disable calendar calendar shared} \
%{__enable_disable ctype ctype shared} \
@@ -2258,15 +2125,13 @@ for sapi in $sapis; do
%{__enable_disable fileinfo fileinfo shared} \
%{__enable_disable ftp ftp shared} \
%{?with_intl:--enable-intl=shared} \
- --enable-libxml \
+ --with-libxml \
%{__enable_disable mbstring mbstring shared,all} \
- --with-onig=/usr \
--enable-mbregex \
%{__enable_disable pcntl pcntl shared} \
%{__enable_disable pdo pdo shared} \
- %{__enable_disable json json shared} \
- %{__enable_disable hash hash shared} \
--enable-xmlwriter=shared \
+ %{?with_avif:--with-avif} \
%if %{with fpm}
--with-fpm-user=http \
--with-fpm-group=http \
@@ -2274,18 +2139,17 @@ for sapi in $sapis; do
%if %{with pdo_dblib}
--with-pdo-dblib=shared \
%endif
-%if %{with interbase} && %{without interbase_inst}
- --with-pdo-firebird=shared,/usr \
+%if %{with pdo_firebird}
+ --with-pdo-firebird=shared \
%endif
%{?with_mhash:--with-mhash=yes} \
--with-mysql-sock=/var/lib/mysql/mysql.sock \
%{__with_without pdo_mysql pdo-mysql shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd}} \
- %{?with_oci:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
- %{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
- %{?with_pgsql:--with-pdo-pgsql=shared} \
- %{?with_pdo_sqlite:--with-pdo-sqlite=shared,/usr} \
- %{?with_webp:--with-webp-dir=/usr} \
- --without-libexpat-dir \
+ %{?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} \
+ %{?with_webp:--with-webp} \
%{__enable_disable posix posix shared} \
--enable-shared \
%{__enable_disable session session shared} \
@@ -2298,22 +2162,22 @@ for sapi in $sapis; do
--enable-sockets=shared \
%{__with_without sodium sodium shared} \
--enable-tokenizer=shared \
- %{?with_wddx:--enable-wddx=shared} \
--enable-xml=shared \
--enable-xmlreader=shared \
- %{__with_without bz2 bz2 shared} \
+ %{__with_without bzip2 bz2 shared} \
%{__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} \
@@ -2323,26 +2187,21 @@ 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_without xmlrpc xmlrpc shared,/usr} \
+ %{?with_odbc:--with-unixODBC=shared} \
%{?with_xsl:--with-xsl=shared} \
--with-zlib=shared \
- --with-zlib-dir=shared,/usr \
- %{?with_system_libzip:--with-libzip} \
- --enable-zip=shared,/usr \
+ %{?with_zip:--with-zip=shared} \
# save for debug
cp -f Makefile Makefile.$sapi
@@ -2363,7 +2222,7 @@ cp -af Makefile.cli Makefile
MYSQLND_SHARED_LIBADD="-lssl -lcrypto"
%if %{with apache2}
-%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp7.la -f Makefile.apxs2
+%{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp8.la -f Makefile.apxs2
%endif
%if %{with litespeed}
@@ -2371,7 +2230,7 @@ cp -af Makefile.cli Makefile
%endif
%if %{with embed}
-%{__make} -f Makefile.embed libphp7.la
+%{__make} -f Makefile.embed libphp8.la
%endif
%if %{with phpdbg}
@@ -2380,10 +2239,6 @@ cp -af Makefile.cli Makefile
PHPDBG_EXTRA_LIBS=-lreadline
%endif
-%if %{with milter}
-%{__make} -f Makefile.milter milter
-%endif
-
# CGI/FCGI
%if %{with cgi}
cp -pf php_config.h.cgi-fcgi main/php_config.h
@@ -2407,34 +2262,7 @@ cp -pf php_config.h.cli main/php_config.h
./sapi/cli/php -n -dextension_dir=modules -dextension=xml.so -r '$p = xml_parser_create(); xml_parse_into_struct($p, "<", $vals, $index); exit((int )empty($vals[0]["value"]));'
# Generate stub .ini files for each extension
-rm -rf conf.d
-install -d conf.d
-generate_inifiles() {
- for so in modules/*.so; do
- mod=$(basename $so .so)
- ext=extension
- # opcache.so is zend extension
- nm $so | grep -q zend_extension_entry && ext=zend_extension
- conf="$mod.ini"
- # xml needs to be loaded before wddx
- [ "$mod" = "wddx" ] && conf="xml_$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"
- # mysqlnd needs to be loaded before mysqli,pdo_mysqli
- [ "$mod" = "mysqlnd" ] && conf="MySQLND.ini"
- echo "+ $conf"
- cat > conf.d/$conf <<-EOF
- ; Enable $mod $ext module
- $ext=$mod.so
- EOF
- done
-}
-generate_inifiles
-cp -p %{_sourcedir}/opcache.ini conf.d
+GENERATE_INI=1 PHP=./sapi/cli/php EXTENSION_DIR=modules CONFIG_DIR=conf.d ./dep-tests.sh
# Check that the module inner-dependencies are intact
PHP=./sapi/cli/php EXTENSION_DIR=modules CONFIG_DIR=conf.d ./dep-tests.sh > dep-tests.log
@@ -2487,22 +2315,20 @@ exit $rc
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cgi}} \
+install -d \
+ $RPM_BUILD_ROOT%{_libdir}/{php,apache} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/{conf,cgi-fcgi,cli,apache2handler}.d \
$RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \
- $RPM_BUILD_ROOT/etc/{apache/conf.d,httpd/conf.d} \
+ $RPM_BUILD_ROOT/etc/httpd/conf.d \
$RPM_BUILD_ROOT%{_mandir}/man{1,8} \
cp -pf php_config.h.cli main/php_config.h
cp -pf Makefile.cli Makefile
%{__make} install \
- phpbuilddir=%{_libdir}/%{name}/build \
+ phpbuilddir=%{_libdir}/php/php%{php_suffix}/build \
INSTALL_ROOT=$RPM_BUILD_ROOT
-# version the .phar files
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/phar{,%{php_suffix}}.phar
-%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/phar{,%{php_suffix}}.1
# touch for ghost
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/phar
touch $RPM_BUILD_ROOT%{_bindir}/phar
touch $RPM_BUILD_ROOT%{_mandir}/man1/phar.1
@@ -2512,10 +2338,10 @@ v=$(echo %{version} | cut -d. -f1-2)
# install Apache2 DSO module
%if %{with apache2}
# versioned libphp
-libtool --mode=install install -p sapi/apache2handler/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.so
-sed -i -e "s|libphp7|libphp%{php_suffix}|g" $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la
+libtool --mode=install install -p sapi/apache2handler/libphp8.la $RPM_BUILD_ROOT%{_libdir}/apache
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp8.la $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp8.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.so
+sed -i -e "s|libphp8|libphp%{php_suffix}|g" $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la
ln -s libphp%{php_suffix}.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so
%endif
@@ -2536,11 +2362,6 @@ touch $RPM_BUILD_ROOT%{_mandir}/man1/phpize.1
touch $RPM_BUILD_ROOT%{_bindir}/php-config
touch $RPM_BUILD_ROOT%{_mandir}/man1/php-config.1
-%if %{with milter}
-%{__make} -f Makefile.milter install-milter \
- INSTALL_ROOT=$RPM_BUILD_ROOT
-%endif
-
# versioned libphp_common
libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir}
%{__mv} $RPM_BUILD_ROOT%{_libdir}/libphp_common.la $RPM_BUILD_ROOT%{_libdir}/libphp_common%{php_suffix}.la
@@ -2554,7 +2375,7 @@ sed -i -e "s|libphp_common|libphp_common%{php_suffix}|g" $RPM_BUILD_ROOT%{_libdi
# install-cgi
libtool --mode=install install -p sapi/cgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/%{name}.cgi
ln -sf %{name}.cgi $RPM_BUILD_ROOT%{_bindir}/%{name}.fcgi
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cgi-fcgi.d/php.ini
%endif
# install FCGI PM
@@ -2584,7 +2405,7 @@ touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm
# we could use install-headers from Makefile.embed, but that would reinstall all headers
# install-sapi installs to wrong dir, so just do it all manually
install -d $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/sapi/embed
-install -p libs/libphp7.so $RPM_BUILD_ROOT%{_libdir}/libphp%{php_suffix}.so
+install -p libs/libphp8.so $RPM_BUILD_ROOT%{_libdir}/libphp%{php_suffix}.so
cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/sapi/embed
%endif
@@ -2595,11 +2416,11 @@ touch $RPM_BUILD_ROOT%{_bindir}/php
touch $RPM_BUILD_ROOT%{_mandir}/man1/php.1
cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
-cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/cli.d/php.ini
%if %{with apache2}
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/httpd/conf.d/70_mod_php.conf
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache2handler.d/php.ini
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp%{php_suffix}.la
%endif
@@ -2613,26 +2434,11 @@ grep -El '/etc/php/|/usr/lib/php/' $RPM_BUILD_ROOT%{_sysconfdir}/*.ini | xargs -
install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
cp -p conf.d/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
-# per SAPI ini directories
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
+cp -p %{_sourcedir}/opcache.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.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
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/??_readline.ini,cli.d}
+
sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize%{php_suffix}
# for php-pecl-mailparse
@@ -2640,14 +2446,14 @@ install -d $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/ext/mbstring
cp -p ext/mbstring/libmbfl/mbfl/*.h $RPM_BUILD_ROOT%{_includedir}/php/php%{php_suffix}/ext/mbstring
# tests
-install -d $RPM_BUILD_ROOT%{php_datadir}/tests/php
-install -p run-tests.php $RPM_BUILD_ROOT%{php_datadir}/tests/php/run-tests.php
-cp -a tests/* $RPM_BUILD_ROOT%{php_datadir}/tests/php
+install -d $RPM_BUILD_ROOT%{php_data_dir}/tests/php
+install -p run-tests.php $RPM_BUILD_ROOT%{php_data_dir}/tests/php/run-tests.php
+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%{php_suffix}.la
-# better solution?
-sed -i -e 's|libphp_common.la|$(libdir)/libphp_common%{php_suffix}.la|' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/acinclude.m4
+
+install -p ext/ext_skel.php $RPM_BUILD_ROOT%{_bindir}/ext_skel%{php_suffix}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2665,7 +2471,7 @@ fi
%post cli
update-alternatives \
--install %{_bindir}/php php %{_bindir}/php%{php_suffix} %{php_suffix} \
- --slave %{_mandir}/man1/php.1 php.1 %{_mandir}/man1/php%{php_suffix}.1* || :
+ --slave %{_mandir}/man1/php.1.gz php.1.gz %{_mandir}/man1/php%{php_suffix}.1.gz || :
%postun cli
if [ $1 -eq 0 ]; then
@@ -2678,10 +2484,12 @@ fi
%post devel
update-alternatives \
--install %{_bindir}/phpize phpize %{_bindir}/phpize%{php_suffix} %{php_suffix} \
- --slave %{_mandir}/man1/php.1 php.1 %{_mandir}/man1/php%{php_suffix}.1* || :
+ --slave %{_mandir}/man1/phpize.1.gz phpize.1.gz %{_mandir}/man1/phpize%{php_suffix}.1.gz || :
update-alternatives \
--install %{_bindir}/php-config php-config %{_bindir}/php-config%{php_suffix} %{php_suffix} \
- --slave %{_mandir}/man1/php.1 php.1 %{_mandir}/man1/php%{php_suffix}.1* || :
+ --slave %{_mandir}/man1/php-config.1.gz php-config.1.gz %{_mandir}/man1/php-config%{php_suffix}.1.gz || :
+update-alternatives \
+ --install %{_bindir}/ext_skel ext_skel %{_bindir}/ext_skel%{php_suffix} %{php_suffix} || :
%postun devel
if [ $1 -eq 0 ]; then
@@ -2695,7 +2503,9 @@ fi
%post fpm
/sbin/chkconfig --add %{name}-fpm
%service %{name}-fpm restart
-update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_suffix}-fpm %{php_suffix} || :
+update-alternatives \
+ --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_suffix}-fpm %{php_suffix} \
+ --slave %{_mandir}/man8/php-fpm.8.gz php-fpm.8.gz %{_mandir}/man8/php-fpm%{php_suffix}.8.gz || :
%preun fpm
if [ "$1" = "0" ]; then
@@ -2732,10 +2542,16 @@ fi
# common package are very important for all this to work.
# restart webserver at the end of transaction
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
[ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
-%triggerpostun common -- php-common < 4:5.3.28-7
+%triggerpostun common -- %{name}-common < 4:5.6.4-2, php-common < 4:5.6.4-2
+# switch to browscap package if the ini file has original value
+%{__sed} -i -e 's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#' %{_sysconfdir}/php.ini
+# disable browscap, if optional package not present
+if [ ! -e /usr/share/browscap/php_browscap.ini ]; then
+ %{__sed} -i -e 's#^browscap = /usr/share/browscap/php_browscap.ini#;' %{_sysconfdir}/php.ini
+fi
+
# migrate configs /etc/php/conf.d -> /etc/phpXY/conf.d/
# do config migration in php-common trigger, as the trigger is ran after all packages are upgraded
# this way we can stick to one trigger, instead of attaching one for each (sub)package!
@@ -2756,14 +2572,6 @@ for f in /etc/php/*.ini.rpmsave /etc/php/*.d/*.ini.rpmsave; do
' $nf
done
-%triggerpostun common -- %{name}-common < 4:5.6.4-2, php-common < 4:5.6.4-2
-# switch to browscap package if the ini file has original value
-%{__sed} -i -e 's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#' %{_sysconfdir}/php.ini
-# disable browscap, if optional package not present
-if [ ! -e /usr/share/browscap/php_browscap.ini ]; then
- %{__sed} -i -e 's#^browscap = /usr/share/browscap/php_browscap.ini#;' %{_sysconfdir}/php.ini
-fi
-
%triggerpostun -n apache-mod_%{name} -- apache-mod_%{name} < 4:7.0.0-2.RC4
sed -i -e 's#modules/libphp[57].so#modules/mod_php.so#g' /etc/httpd/conf.d/*_mod_php.conf
@@ -2798,18 +2606,16 @@ 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
%extension_scripts mbstring
%extension_scripts mysqli
@@ -2818,20 +2624,18 @@ 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
%extension_scripts session
%extension_scripts shmop
%extension_scripts simplexml
@@ -2839,17 +2643,14 @@ fi \
%extension_scripts soap
%extension_scripts sockets
%extension_scripts sodium
-%extension_scripts spl
%extension_scripts sqlite3
%extension_scripts sysvmsg
%extension_scripts sysvsem
%extension_scripts sysvshm
%extension_scripts tidy
%extension_scripts tokenizer
-%extension_scripts wddx
%extension_scripts xml
%extension_scripts xmlreader
-%extension_scripts xmlrpc
%extension_scripts xmlwriter
%extension_scripts xsl
%extension_scripts zip
@@ -2859,7 +2660,7 @@ fi \
%ext_post
update-alternatives \
--install %{_bindir}/phar phar %{_bindir}/phar%{php_suffix}.phar %{php_suffix} \
- --slave %{_mandir}/man1/phar.1 phar.1 %{_mandir}/man1/phar%{php_suffix}.1* || :
+ --slave %{_mandir}/man1/phar.1.gz phar.1.gz %{_mandir}/man1/phar%{php_suffix}.1.gz || :
%postun phar
%ext_postun
@@ -2871,9 +2672,12 @@ fi
%files -n apache-mod_%{name}
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php.conf
-%dir %{_sysconfdir}/apache2handler.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
%attr(755,root,root) %{_libdir}/apache/mod_php.so
+
+%files -n apache-mod_%{name}-core
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/apache2handler.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache2handler.d/php.ini
%attr(755,root,root) %{_libdir}/apache/libphp%{php_suffix}.so
%endif
@@ -2887,7 +2691,7 @@ fi
%files cgi
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cgi-fcgi.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cgi-fcgi.d/php.ini
%attr(755,root,root) %{_bindir}/%{name}.cgi
%attr(755,root,root) %{_bindir}/%{name}.fcgi
%endif
@@ -2901,7 +2705,7 @@ fi
%files cli
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cli.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/php.ini
%attr(755,root,root) %{_bindir}/php%{php_suffix}
%{_mandir}/man1/php%{php_suffix}.1*
%ghost %{_bindir}/php
@@ -2928,27 +2732,22 @@ fi
%{_mandir}/man1/phpdbg%{php_suffix}.1*
%endif
-%if %{with milter}
-%files milter
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/php-milter
-%endif
-
%files common
%defattr(644,root,root,755)
-%doc CREDITS EXTENSIONS LICENSE NEWS UPGRADING* Zend/{LICENSE.Zend,README*} php.ini-*
+%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
%attr(755,root,root) %{_libdir}/libphp_common%{php_suffix}-*.so
-%dir %{php_datadir}
+%dir %{php_data_dir}
%dir %{php_extensiondir}
%doc ext/session/mod_files.sh
%files devel
%defattr(644,root,root,755)
-%doc CODING_STANDARDS README.{EXT_SKEL,PARAMETER_PARSING_API,SELF-CONTAINED-EXTENSIONS,STREAMS,SUBMITTING_PATCH,TESTING,TESTING2,UNIX-BUILD-SYSTEM,input_filter}
+%doc CODING_STANDARDS.md docs/*.md
+%attr(755,root,root) %{_bindir}/ext_skel%{php_suffix}
%attr(755,root,root) %{_bindir}/phpize%{php_suffix}
%attr(755,root,root) %{_bindir}/php-config%{php_suffix}
%ghost %{_bindir}/phpize
@@ -2956,7 +2755,7 @@ fi
%attr(755,root,root) %{_libdir}/libphp_common%{php_suffix}.so
%{_libdir}/libphp_common%{php_suffix}.la
%{_includedir}/php/php%{php_suffix}
-%{_libdir}/%{name}/build
+%{_libdir}/php/php%{php_suffix}/build
%{_mandir}/man1/php-config%{php_suffix}.1*
%ghost %{_mandir}/man1/php-config.1*
%{_mandir}/man1/phpize%{php_suffix}.1*
@@ -2965,15 +2764,15 @@ fi
%if %{with bcmath}
%files bcmath
%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bcmath.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_bcmath.ini
%attr(755,root,root) %{php_extensiondir}/bcmath.so
%endif
-%if %{with bz2}
+%if %{with bzip2}
%files bz2
%defattr(644,root,root,755)
%doc ext/bz2/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bz2.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_bz2.ini
%attr(755,root,root) %{php_extensiondir}/bz2.so
%endif
@@ -2981,7 +2780,7 @@ fi
%files calendar
%defattr(644,root,root,755)
%doc ext/calendar/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/calendar.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_calendar.ini
%attr(755,root,root) %{php_extensiondir}/calendar.so
%endif
@@ -2989,7 +2788,7 @@ fi
%files ctype
%defattr(644,root,root,755)
%doc ext/calendar/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ctype.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_ctype.ini
%attr(755,root,root) %{php_extensiondir}/ctype.so
%endif
@@ -2997,32 +2796,31 @@ fi
%files curl
%defattr(644,root,root,755)
%doc ext/curl/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/curl.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_curl.ini
%attr(755,root,root) %{php_extensiondir}/curl.so
%endif
%if %{with dba}
%files dba
%defattr(644,root,root,755)
-%doc ext/dba/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dba.ini
+%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
%if %{with dom}
%files dom
%defattr(644,root,root,755)
-%doc ext/dom/{CREDITS,TODO}
-%doc ext/dom/examples
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini
+%doc ext/dom/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_dom.ini
%attr(755,root,root) %{php_extensiondir}/dom.so
%endif
%if %{with enchant}
%files enchant
%defattr(644,root,root,755)
-%doc ext/enchant/{CREDITS,docs/examples}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/enchant.ini
+%doc ext/enchant/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_enchant.ini
%attr(755,root,root) %{php_extensiondir}/enchant.so
%endif
@@ -3030,23 +2828,31 @@ fi
%files exif
%defattr(644,root,root,755)
%doc ext/exif/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/exif.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_exif.ini
%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)
%doc ext/fileinfo/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/fileinfo.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_fileinfo.ini
%attr(755,root,root) %{php_extensiondir}/fileinfo.so
%endif
%if %{with filter}
%files filter
%defattr(644,root,root,755)
-%doc ext/filter/{CREDITS,docs/*}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filter.ini
+%doc ext/filter/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_filter.ini
%attr(755,root,root) %{php_extensiondir}/filter.so
%endif
@@ -3054,7 +2860,7 @@ fi
%files ftp
%defattr(644,root,root,755)
%doc ext/ftp/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ftp.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_ftp.ini
%attr(755,root,root) %{php_extensiondir}/ftp.so
%endif
@@ -3062,7 +2868,7 @@ fi
%files gd
%defattr(644,root,root,755)
%doc ext/gd/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gd.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_gd.ini
%attr(755,root,root) %{php_extensiondir}/gd.so
%endif
@@ -3070,31 +2876,23 @@ fi
%files gettext
%defattr(644,root,root,755)
%doc ext/gettext/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gettext.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_gettext.ini
%attr(755,root,root) %{php_extensiondir}/gettext.so
%endif
%if %{with gmp}
%files gmp
%defattr(644,root,root,755)
-%doc ext/gmp/{CREDITS,README,TODO}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini
+%doc ext/gmp/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_gmp.ini
%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)
%doc ext/iconv/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_iconv.ini
%attr(755,root,root) %{php_extensiondir}/iconv.so
%endif
@@ -3102,55 +2900,39 @@ fi
%files imap
%defattr(644,root,root,755)
%doc ext/imap/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/imap.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_imap.ini
%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)
-%doc ext/intl/{CREDITS,TODO}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/intl.ini
+%doc ext/intl/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_intl.ini
%attr(755,root,root) %{php_extensiondir}/intl.so
%endif
-%if %{with json}
-%files json
-%defattr(644,root,root,755)
-%doc ext/json/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/json.ini
-%attr(755,root,root) %{php_extensiondir}/json.so
-%endif
-
%if %{with ldap}
%files ldap
%defattr(644,root,root,755)
%doc ext/ldap/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ldap.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_ldap.ini
%attr(755,root,root) %{php_extensiondir}/ldap.so
%endif
%if %{with mbstring}
%files mbstring
%defattr(644,root,root,755)
-%doc ext/mbstring/{CREDITS,README*}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini
+%doc ext/mbstring/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_mbstring.ini
%attr(755,root,root) %{php_extensiondir}/mbstring.so
%endif
%if %{with mysqli}
%files mysqli
%defattr(644,root,root,755)
-%doc ext/mysqli/{CREDITS,TODO}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysqli.ini
+%doc ext/mysqli/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_mysqli.ini
%attr(755,root,root) %{php_extensiondir}/mysqli.so
%endif
@@ -3158,15 +2940,15 @@ fi
%files mysqlnd
%defattr(644,root,root,755)
%doc ext/mysqlnd/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/MySQLND.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_mysqlnd.ini
%attr(755,root,root) %{php_extensiondir}/mysqlnd.so
%endif
-%if %{with oci}
+%if %{with pdo_oci}
%files oci8
%defattr(644,root,root,755)
%doc ext/oci8/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oci8.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_oci8.ini
%attr(755,root,root) %{php_extensiondir}/oci8.so
%endif
@@ -3174,14 +2956,14 @@ fi
%files odbc
%defattr(644,root,root,755)
%doc ext/odbc/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/odbc.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_odbc.ini
%attr(755,root,root) %{php_extensiondir}/odbc.so
%endif
%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
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/opcache.ini
%attr(755,root,root) %{php_extensiondir}/opcache.so
%endif
@@ -3189,48 +2971,40 @@ fi
%if %{with openssl}
%files openssl
%defattr(644,root,root,755)
-%doc ext/openssl/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/openssl.ini
+%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
%if %{with pcntl}
%files pcntl
%defattr(644,root,root,755)
-%doc ext/pcntl/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pcntl.ini
+%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,TODO}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo.ini
+%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
%if %{with pdo_dblib}
%files pdo-dblib
%defattr(644,root,root,755)
-%doc ext/pdo_dblib/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_dblib.ini
+%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
-%if %{with interbase} && !%{with interbase_inst}
+%if %{with pdo_firebird}
%files pdo-firebird
%defattr(644,root,root,755)
%doc ext/pdo_firebird/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_firebird.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pdo_firebird.ini
%attr(755,root,root) %{php_extensiondir}/pdo_firebird.so
%endif
@@ -3238,7 +3012,7 @@ fi
%files pdo-mysql
%defattr(644,root,root,755)
%doc ext/pdo_mysql/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_mysql.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pdo_mysql.ini
%attr(755,root,root) %{php_extensiondir}/pdo_mysql.so
%endif
@@ -3246,23 +3020,23 @@ fi
%files pdo-oci
%defattr(644,root,root,755)
%doc ext/pdo_oci/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_oci.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pdo_oci.ini
%attr(755,root,root) %{php_extensiondir}/pdo_oci.so
%endif
-%if %{with odbc}
+%if %{with pdo_odbc}
%files pdo-odbc
%defattr(644,root,root,755)
%doc ext/pdo_odbc/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_odbc.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pdo_odbc.ini
%attr(755,root,root) %{php_extensiondir}/pdo_odbc.so
%endif
-%if %{with pgsql}
+%if %{with pdo_pgsql}
%files pdo-pgsql
%defattr(644,root,root,755)
%doc ext/pdo_pgsql/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_pgsql.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pdo_pgsql.ini
%attr(755,root,root) %{php_extensiondir}/pdo_pgsql.so
%endif
@@ -3270,27 +3044,26 @@ fi
%files pdo-sqlite
%defattr(644,root,root,755)
%doc ext/pdo_sqlite/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_sqlite.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pdo_sqlite.ini
%attr(755,root,root) %{php_extensiondir}/pdo_sqlite.so
%endif
%if %{with pgsql}
%files pgsql
%defattr(644,root,root,755)
-%doc ext/pgsql/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pgsql.ini
+%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
%if %{with phar}
%files phar
%defattr(644,root,root,755)
-%doc ext/phar/{CREDITS,TODO}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/phar.ini
+%doc ext/phar/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_phar.ini
%attr(755,root,root) %{php_extensiondir}/phar.so
%attr(755,root,root) %{_bindir}/phar%{php_suffix}.phar
%{_mandir}/man1/phar%{php_suffix}.1*
-%{_mandir}/man1/phar.phar.1*
%ghost %{_bindir}/phar
%ghost %{_mandir}/man1/phar.1*
%endif
@@ -3299,200 +3072,165 @@ fi
%files posix
%defattr(644,root,root,755)
%doc ext/posix/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/posix.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_posix.ini
%attr(755,root,root) %{php_extensiondir}/posix.so
%endif
%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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pspell.ini
%attr(755,root,root) %{php_extensiondir}/pspell.so
%endif
%if %{with readline}
%files readline
%defattr(644,root,root,755)
-%doc ext/readline/{CREDITS,README*}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/readline.ini
+%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
-%if %{with recode}
-%files recode
-%defattr(644,root,root,755)
-%doc ext/recode/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/recode.ini
-%attr(755,root,root) %{php_extensiondir}/recode.so
-%endif
-
%if %{with session}
%files session
%defattr(644,root,root,755)
%doc ext/session/CREDITS
%doc ext/session/mod_files.sh
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/Session.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_session.ini
%attr(755,root,root) %{php_extensiondir}/session.so
%endif
%files shmop
%defattr(644,root,root,755)
-%doc ext/shmop/{CREDITS,README}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/shmop.ini
+%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/examples
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/simplexml.ini
+%doc ext/simplexml/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_simplexml.ini
%attr(755,root,root) %{php_extensiondir}/simplexml.so
%if %{with snmp}
%files snmp
%defattr(644,root,root,755)
%doc ext/snmp/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/snmp.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_snmp.ini
%attr(755,root,root) %{php_extensiondir}/snmp.so
%endif
%files soap
%defattr(644,root,root,755)
-%doc ext/soap/{CREDITS,TODO*}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/soap.ini
+%doc ext/soap/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_soap.ini
%attr(755,root,root) %{php_extensiondir}/soap.so
%files sockets
%defattr(644,root,root,755)
%doc ext/sockets/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sockets.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_sockets.ini
%attr(755,root,root) %{php_extensiondir}/sockets.so
%if %{with sodium}
%files sodium
%defattr(644,root,root,755)
%doc ext/sodium/{README.md,CREDITS}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sodium.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_sodium.ini
%attr(755,root,root) %{php_extensiondir}/sodium.so
%endif
-%files spl
-%defattr(644,root,root,755)
-%doc ext/spl/{CREDITS,README,TODO}
-%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)
%doc ext/sqlite3/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sqlite3.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_sqlite3.ini
%attr(755,root,root) %{php_extensiondir}/sqlite3.so
%endif
%files sysvmsg
%defattr(644,root,root,755)
%doc ext/sysvmsg/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvmsg.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_sysvmsg.ini
%attr(755,root,root) %{php_extensiondir}/sysvmsg.so
%files sysvsem
%defattr(644,root,root,755)
%doc ext/sysvsem/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvsem.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_sysvsem.ini
%attr(755,root,root) %{php_extensiondir}/sysvsem.so
%files sysvshm
%defattr(644,root,root,755)
%doc ext/sysvshm/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvshm.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_sysvshm.ini
%attr(755,root,root) %{php_extensiondir}/sysvshm.so
%files tests
%defattr(644,root,root,755)
-%dir %{php_datadir}/tests
-%dir %{php_datadir}/tests/php
-%{php_datadir}/tests/php/basic
-%{php_datadir}/tests/php/classes
-%{php_datadir}/tests/php/func
-%{php_datadir}/tests/php/lang
-%{php_datadir}/tests/php/output
-%{php_datadir}/tests/php/run-test
-%{php_datadir}/tests/php/security
-%{php_datadir}/tests/php/strings
-%{php_datadir}/tests/php/quicktester.inc
-%attr(755,root,root) %{php_datadir}/tests/php/run-tests.php
+%dir %{php_data_dir}/tests
+%dir %{php_data_dir}/tests/php
+%{php_data_dir}/tests/php/basic
+%{php_data_dir}/tests/php/classes
+%{php_data_dir}/tests/php/func
+%{php_data_dir}/tests/php/lang
+%{php_data_dir}/tests/php/output
+%{php_data_dir}/tests/php/run-test
+%{php_data_dir}/tests/php/security
+%{php_data_dir}/tests/php/strings
+%attr(755,root,root) %{php_data_dir}/tests/php/run-tests.php
%if %{with tidy}
%files tidy
%defattr(644,root,root,755)
-%doc ext/tidy/{CREDITS,README}
-%doc ext/tidy/examples
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/tidy.ini
+%doc ext/tidy/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_tidy.ini
%attr(755,root,root) %{php_extensiondir}/tidy.so
%endif
%files tokenizer
%defattr(644,root,root,755)
%doc ext/tokenizer/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/tokenizer.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_tokenizer.ini
%attr(755,root,root) %{php_extensiondir}/tokenizer.so
-%if %{with wddx}
-%files wddx
-%defattr(644,root,root,755)
-%doc ext/wddx/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*wddx.ini
-%attr(755,root,root) %{php_extensiondir}/wddx.so
-%endif
-
%files xml
%defattr(644,root,root,755)
%doc ext/xml/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xml.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_xml.ini
%attr(755,root,root) %{php_extensiondir}/xml.so
%files xmlreader
%defattr(644,root,root,755)
-%doc ext/xmlreader/{CREDITS,README,TODO}
-%doc ext/xmlreader/examples
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlreader.ini
+%doc ext/xmlreader/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_xmlreader.ini
%attr(755,root,root) %{php_extensiondir}/xmlreader.so
-%if %{with xmlrpc}
-%files xmlrpc
-%defattr(644,root,root,755)
-%doc ext/xmlrpc/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlrpc.ini
-%attr(755,root,root) %{php_extensiondir}/xmlrpc.so
-%endif
-
%files xmlwriter
%defattr(644,root,root,755)
-%doc ext/xmlwriter/{CREDITS,TODO}
-%doc ext/xmlwriter/examples
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlwriter.ini
+%doc ext/xmlwriter/CREDITS
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_xmlwriter.ini
%attr(755,root,root) %{php_extensiondir}/xmlwriter.so
%if %{with xsl}
%files xsl
%defattr(644,root,root,755)
%doc ext/xsl/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xsl.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_xsl.ini
%attr(755,root,root) %{php_extensiondir}/xsl.so
%endif
+%if %{with zip}
%files zip
%defattr(644,root,root,755)
-%doc ext/zip/{CREDITS,TODO}
+%doc ext/zip/CREDITS
%doc ext/zip/examples
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zip.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_zip.ini
%attr(755,root,root) %{php_extensiondir}/zip.so
+%endif
%files zlib
%defattr(644,root,root,755)
%doc ext/zlib/CREDITS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zlib.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_zlib.ini
%attr(755,root,root) %{php_extensiondir}/zlib.so