X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=967dd40e99046ee26970521ce6d2d730b01456ec;hp=d842d680a2a2aa64e7eabd2caf95bc74b0493673;hb=61d0f04;hpb=366bc713877eda5c46a754050fec9396ca4347e9 diff --git a/php.spec b/php.spec index d842d68..967dd40 100644 --- a/php.spec +++ b/php.spec @@ -1,34 +1,20 @@ # NOTES # - mysqlnd driver doesn't support reconnect: https://bugs.php.net/bug.php?id=52561 -# TODO 7.4: -# - follow upstream: drop spl, pcre, subpackages (tired of maintaining them) # 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 %bcond_without alternatives # use alternatives system to select default phar and php-fpm %bcond_with default_php # build this PHP as default PHP in system (disables alternatives) # - 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 systemtap # systemtap/DTrace support @@ -40,11 +26,10 @@ %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 @@ -52,6 +37,7 @@ %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 @@ -61,7 +47,6 @@ %bcond_without iconv # without iconv extension module %bcond_without 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) @@ -72,7 +57,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 @@ -86,14 +71,12 @@ %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 xmlrpc # without XML-RPC extension module %bcond_without xsl # without xsl extension module %bcond_without zip # without zip extension module # extensions options @@ -104,9 +87,13 @@ %bcond_without system_gd # system gd %bcond_without webp # Without WebP support in GD extension (imagecreatefromwebp) -%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 @@ -123,11 +110,6 @@ %undefine with_mm %endif -# milter requires ZTS -%if %{with milter} && %{without zts} -%undefine with_milter -%endif - %if %{without odbc} %undefine with_pdo_odbc %endif @@ -145,11 +127,6 @@ %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 @@ -160,33 +137,32 @@ %undefine with_pdo_sqlite %endif -%define subver alpha1 %define orgname php -%define ver_suffix 74 +%define ver_suffix 80 %define php_suffix %{!?with_default_php:%{ver_suffix}} 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.4.0 -Release: 0.1 +Version: 8.0.7 +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: https://php.net/distributions/%{orgname}-%{version}.tar.xz -Source0: https://downloads.php.net/~derick/php-%{version}%{subver}.tar.xz -# Source0-md5: 29592e9a73c0ae615c4b7e2b4761184f +Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz +# Source0-md5: ee5d675f8e9d58fcdc4c887d3d9e8412 Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini Source5: %{orgname}-cli.ini +Source6: timezone.ini Source10: %{orgname}-fpm.init Source11: %{orgname}-fpm.logrotate Source12: %{orgname}-branch.sh @@ -197,47 +173,35 @@ 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 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}-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 Patch60: %{orgname}-oracle-instantclient.patch Patch66: php-db.patch Patch67: mysql-lib-ver-mismatch.patch # https://bugs.php.net/bug.php?id=68344 Patch68: php-mysql-ssl-context.patch -Patch70: mysqlnd-ssl.patch Patch71: libdb-info.patch URL: http://php.net/ -%{?with_pdo_firebase:%{!?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 @@ -248,9 +212,6 @@ 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 @@ -260,20 +221,20 @@ 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_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} -%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} @@ -289,24 +250,22 @@ 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 -%{?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.4 %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} @@ -321,9 +280,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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 20190529 +%define php_api_version 20200930 %define zend_module_api %{php_api_version} -%define zend_extension_api 3%{zend_module_api} +%define zend_extension_api 4%{zend_module_api} %define php_pdo_api_version 20170320 # Extension versions @@ -332,10 +291,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define fileinfover %{version} %define hashver %{version} %define intlver %{version} -%define jsonver 1.7.0 +%define jsonver %{version} %define pharver %{version} %define sqlite3ver %{version} -%define zipver 1.15.4 +%define zipver 1.19.2 %define phpdbgver %{version} %define sodiumver %{version} @@ -500,7 +459,6 @@ Summary: /usr/bin/php symlink Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} -Obsoletes: /usr/bin/php Obsoletes: php-program < 4:5.3.28-7 %description program @@ -584,16 +542,20 @@ 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 Obsoletes: php-filepro < 4:5.2.0 @@ -602,9 +564,11 @@ 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 @@ -636,14 +600,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 @@ -657,6 +617,7 @@ Obsoletes: php56-devel Obsoletes: php70-devel Obsoletes: php71-devel Obsoletes: php73-devel +Obsoletes: php74-devel %description devel The php-devel package lets you compile dynamic extensions to PHP. @@ -863,6 +824,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 @@ -1261,22 +1238,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) @@ -1528,24 +1489,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 @@ -1649,6 +1592,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} @@ -1657,23 +1601,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 @@ -1758,9 +1687,7 @@ Summary(pl.UTF-8): Zawiera pliki testów jednostkowych dla PHP i rozszerzeń Group: Libraries URL: http://qa.php.net/ Requires: %{name}-cli -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %description tests This package contains unit tests for PHP and its extensions. @@ -1841,23 +1768,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 @@ -1934,56 +1844,45 @@ Moduł PHP umożliwiający używanie kompresji zlib. %prep %setup -q -n %{orgname}-%{version}%{?subver} + cp -p php.ini-production php.ini %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 -b .mail %patch3 -p1 %patch4 -p1 -%patch7 -p1 -%{?with_milter:%patch8 -p1} +%patch7 -p1 -b .sapi-ini-file %patch9 -p1 -%patch10 -p1 +%patch10 -p1 -b .ini %patch14 -p1 -%patch17 -p1 %patch18 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 -%patch24 -p1 +%patch24 -p1 -b .zlib-for-getimagesize %patch25 -p1 -%patch26 -p1 %patch27 -p1 %patch29 -p1 %patch31 -p1 -%if "%{pld_release}" != "ac" -%patch34 -p1 -%endif -%patch39 -p1 +%patch39 -p1 -b .use-prog_sendmail %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 %patch59 -p1 -b .systzdata %if %{with instantclient} %patch60 -p1 -b .instantclient %endif %patch66 -p1 -%patch67 -p1 +%patch67 -p1 -b .mysql-lib-ver-mismatch #%patch68 -p1 DROP or update to 7.0 APIs -%patch70 -p1 -%patch71 -p1 +%patch71 -p1 -b .libdb-info -%{__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,' \ + ext/ext_skel.php \ + run-tests.php # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -1991,9 +1890,6 @@ 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/bcmath/libbcmath #%{__rm} -r ext/date/lib @@ -2003,9 +1899,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/pcre/pcre2lib +#%{__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 @@ -2141,8 +2036,8 @@ 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 @@ -2177,10 +2072,15 @@ 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 - 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 @@ -2193,8 +2093,7 @@ if [ ! -f _built-conf ]; then 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 @@ -2226,9 +2125,6 @@ apxs2 %if %{with phpdbg} phpdbg %endif -%if %{with milter} -milter -%endif " for sapi in $sapis; do : SAPI $sapi @@ -2259,9 +2155,6 @@ for sapi in $sapis; do phpdbg) sapi_args='--enable-phpdbg %{?debug:--enable-phpdbg-debug}' ;; - milter) - sapi_args='--with-milter' - ;; esac %configure \ @@ -2280,7 +2173,7 @@ for sapi in $sapis; do %{?with_argon2:--with-password-argon2} \ --%{!?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} \ @@ -2296,7 +2189,6 @@ for sapi in $sapis; do --enable-mbregex \ %{__enable_disable pcntl pcntl shared} \ %{__enable_disable pdo pdo shared} \ - %{__enable_disable json json shared} \ --enable-xmlwriter=shared \ %if %{with fpm} --with-fpm-user=http \ @@ -2306,7 +2198,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 \ @@ -2314,9 +2206,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 --with-webp} \ - --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} \ @@ -2331,19 +2222,20 @@ for sapi in $sapis; do --enable-tokenizer=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} \ - %{__enable_disable 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-jpeg-dir=/usr \ + --with-jpeg \ %{?with_ldap:--with-ldap=shared --with-ldap-sasl} \ %{?with_mm:--with-mm} \ %{?with_mysqlnd:--enable-mysqlnd=shared} \ @@ -2353,25 +2245,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_zip:--enable-zip=shared,/usr --with-libzip} \ + %{?with_zip:--with-zip=shared} \ # save for debug cp -f Makefile Makefile.$sapi @@ -2392,7 +2280,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} @@ -2400,7 +2288,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} @@ -2409,10 +2297,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 @@ -2436,32 +2320,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" - # 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 @@ -2514,9 +2373,11 @@ 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 @@ -2542,9 +2403,9 @@ v=$(echo %{version} | cut -d. -f1-2) # install Apache2 DSO module %if %{with apache2} -libtool --mode=install install -p sapi/apache2handler/libphp7.la $RPM_BUILD_ROOT%{_libdir}/apache -%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp7{,-$v}.so -ln -s libphp7-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so +libtool --mode=install install -p sapi/apache2handler/libphp8.la $RPM_BUILD_ROOT%{_libdir}/apache +%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp8{,-$v}.so +ln -s libphp8-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so %endif # install litespeed sapi @@ -2564,11 +2425,6 @@ libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/ %endif %endif -%if %{with milter} -%{__make} -f Makefile.milter install-milter \ - INSTALL_ROOT=$RPM_BUILD_ROOT -%endif - libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir} # install CGI/FCGI @@ -2576,7 +2432,7 @@ libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir} # 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 @@ -2611,7 +2467,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/sapi/embed -install -p libs/libphp7.so $RPM_BUILD_ROOT%{_libdir} +install -p libs/libphp8.so $RPM_BUILD_ROOT%{_libdir} cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed %endif @@ -2623,12 +2479,13 @@ echo ".so php%{ver_suffix}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1 ln -sf php%{ver_suffix} $RPM_BUILD_ROOT%{_bindir}/php cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini -cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini +cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/timezone.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 -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp7.la +cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache2handler.d/php.ini +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp8.la %endif # ensure that paths are correct for current php version and arch @@ -2640,27 +2497,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 # for php-pecl-mailparse @@ -2674,8 +2515,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} @@ -2725,7 +2564,7 @@ if ! grep -q '^date.timezone[[:space:]]*=' %{_sysconfdir}/php.ini && [ -f /etc/s TIMEZONE= . /etc/sysconfig/timezone if [ "$TIMEZONE" ]; then - %{__sed} -i -e "s,^;date.timezone[[:space:]]*=.*,date.timezone = $TIMEZONE," %{_sysconfdir}/php.ini + %{__sed} -i -e "s,^;date.timezone[[:space:]]*=.*,date.timezone = $TIMEZONE," %{_sysconfdir}/conf.d/timezone.ini fi fi @@ -2739,10 +2578,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! @@ -2763,14 +2608,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 @@ -2805,6 +2642,7 @@ fi \ %extension_scripts dom %extension_scripts enchant %extension_scripts exif +%extension_scripts ffi %extension_scripts fileinfo %extension_scripts filter %extension_scripts ftp @@ -2823,20 +2661,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 @@ -2844,7 +2680,6 @@ fi \ %extension_scripts soap %extension_scripts sockets %extension_scripts sodium -%extension_scripts spl %extension_scripts sqlite3 %extension_scripts sysvmsg %extension_scripts sysvsem @@ -2853,7 +2688,6 @@ fi \ %extension_scripts tokenizer %extension_scripts xml %extension_scripts xmlreader -%extension_scripts xmlrpc %extension_scripts xmlwriter %extension_scripts xsl %extension_scripts zip @@ -2884,8 +2718,8 @@ fi %files -n apache-mod_%{name}-core %defattr(644,root,root,755) %dir %{_sysconfdir}/apache2handler.d -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini -%attr(755,root,root) %{_libdir}/apache/libphp7-*.*.so +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache2handler.d/php.ini +%attr(755,root,root) %{_libdir}/apache/libphp8-*.*.so %endif %if %{with litespeed} @@ -2898,7 +2732,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 @@ -2906,13 +2740,13 @@ fi %if %{with embed} %files embedded %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libphp7.so +%attr(755,root,root) %{_libdir}/libphp8.so %endif %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%{ver_suffix} %{_mandir}/man1/php%{ver_suffix}.1* @@ -2944,18 +2778,13 @@ 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 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 +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/timezone.ini %attr(755,root,root) %{_libdir}/libphp_common-*.so %dir %{php_extensiondir} @@ -2977,15 +2806,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 @@ -2993,7 +2822,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 @@ -3001,7 +2830,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 @@ -3009,7 +2838,7 @@ 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 @@ -3017,7 +2846,7 @@ fi %files dba %defattr(644,root,root,755) %doc ext/dba/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dba.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_dba.ini %attr(755,root,root) %{php_extensiondir}/dba.so %endif @@ -3025,7 +2854,7 @@ fi %files dom %defattr(644,root,root,755) %doc ext/dom/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_dom.ini %attr(755,root,root) %{php_extensiondir}/dom.so %endif @@ -3033,7 +2862,7 @@ fi %files enchant %defattr(644,root,root,755) %doc ext/enchant/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/enchant.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_enchant.ini %attr(755,root,root) %{php_extensiondir}/enchant.so %endif @@ -3041,15 +2870,23 @@ 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 @@ -3057,7 +2894,7 @@ fi %files filter %defattr(644,root,root,755) %doc ext/filter/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filter.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_filter.ini %attr(755,root,root) %{php_extensiondir}/filter.so %endif @@ -3065,7 +2902,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 @@ -3073,7 +2910,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 @@ -3081,7 +2918,7 @@ 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 @@ -3089,7 +2926,7 @@ fi %files gmp %defattr(644,root,root,755) %doc ext/gmp/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_gmp.ini %attr(755,root,root) %{php_extensiondir}/gmp.so %endif @@ -3097,7 +2934,7 @@ fi %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 @@ -3105,7 +2942,7 @@ 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 @@ -3113,23 +2950,19 @@ fi %files intl %defattr(644,root,root,755) %doc ext/intl/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/intl.ini +%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 @@ -3137,7 +2970,7 @@ fi %files mbstring %defattr(644,root,root,755) %doc ext/mbstring/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_mbstring.ini %attr(755,root,root) %{php_extensiondir}/mbstring.so %endif @@ -3145,7 +2978,7 @@ fi %files mysqli %defattr(644,root,root,755) %doc ext/mysqli/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysqli.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_mysqli.ini %attr(755,root,root) %{php_extensiondir}/mysqli.so %endif @@ -3153,7 +2986,7 @@ 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 @@ -3161,7 +2994,7 @@ fi %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 @@ -3169,13 +3002,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) +%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 @@ -3184,7 +3018,7 @@ fi %files openssl %defattr(644,root,root,755) %doc ext/openssl/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/openssl.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_openssl.ini %attr(755,root,root) %{php_extensiondir}/openssl.so %endif @@ -3192,23 +3026,15 @@ fi %files pcntl %defattr(644,root,root,755) %doc ext/pcntl/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pcntl.ini +%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 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pdo.ini %attr(755,root,root) %{php_extensiondir}/pdo.so %endif @@ -3216,7 +3042,7 @@ fi %files pdo-dblib %defattr(644,root,root,755) %doc ext/pdo_dblib/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_dblib.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pdo_dblib.ini %attr(755,root,root) %{php_extensiondir}/pdo_dblib.so %endif @@ -3224,7 +3050,7 @@ fi %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 @@ -3232,7 +3058,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 @@ -3240,7 +3066,7 @@ 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 @@ -3248,7 +3074,7 @@ fi %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 @@ -3256,7 +3082,7 @@ fi %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 @@ -3264,7 +3090,7 @@ 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 @@ -3272,7 +3098,7 @@ fi %files pgsql %defattr(644,root,root,755) %doc ext/pgsql/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pgsql.ini +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/??_pgsql.ini %attr(755,root,root) %{php_extensiondir}/pgsql.so %endif @@ -3280,7 +3106,7 @@ fi %files phar %defattr(644,root,root,755) %doc ext/phar/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/phar.ini +%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* @@ -3297,14 +3123,14 @@ 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) -%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 @@ -3312,97 +3138,83 @@ fi %files readline %defattr(644,root,root,755) %doc ext/readline/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/readline.ini +%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 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/shmop.ini +%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 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/simplexml.ini +%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 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/soap.ini +%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 -%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 @@ -3424,47 +3236,39 @@ fi %files tidy %defattr(644,root,root,755) %doc ext/tidy/CREDITS -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/tidy.ini +%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 %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 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlreader.ini +%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 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlwriter.ini +%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 @@ -3473,12 +3277,12 @@ fi %defattr(644,root,root,755) %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