From 64ac4716bd7c985525c12fbeb15150b8340e1f35 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Oct 2022 10:33:09 +0200 Subject: update to 8.2.0RC5 --- failed.txt | 2 +- php82.spec | 87 +++++++++++++++++++++++++++++++------------------------------- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/failed.txt b/failed.txt index c58a92c..0e94bbe 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 8.2.0RC4 (2022-10-13) +===== 8.2.0RC5 (2022-10-24) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php82.spec b/php82.spec index 86601f5..9d8ce1e 100644 --- a/php82.spec +++ b/php82.spec @@ -108,13 +108,13 @@ %bcond_with zip %global upver 8.2.0 -%global rcver RC4 -%global lower RC4 +%global rcver RC5 +%global lower RC5 Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{lower}} -Release: 5%{?dist} +Release: 6%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -232,14 +232,12 @@ BuildRequires: /bin/ps BuildRequires: tzdata %endif -%if 0%{?rhel} -Obsoletes: php53, php53u, php54w, php55u, php55w, php56u, php56w, mod_php70u, php70w, mod_php71u, mod_php71w, mod_php72u, mod_php72w +%if 0%{?rhel} == 7 +Obsoletes: php53, php53u, php54, php54w, php55u, php55w, php56u, php56w, mod_php70u, php70w, mod_php71u, mod_php71w, mod_php72u, mod_php72w Obsoletes: mod_php73, mod_php73w Obsoletes: mod_php74, mod_php74w Obsoletes: mod_php80 %endif -# Avoid obsoleting php54 from RHSCL -Obsoletes: php54 > 5.4 %if %{with zts} Obsoletes: php-zts < 5.3.7 Provides: php-zts = %{version}-%{release} @@ -295,7 +293,7 @@ Requires: php-common%{?_isa} = %{version}-%{release} Provides: php-cgi = %{version}-%{release}, php-cgi%{?_isa} = %{version}-%{release} Provides: php-pcntl, php-pcntl%{?_isa} Provides: php-readline, php-readline%{?_isa} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-cli, php53u-cli, php54-cli, php54w-cli, php55u-cli, php55w-cli, php56u-cli, php56w-cli Obsoletes: php70u-cli, php70w-cli, php71u-cli, php71w-cli, php72u-cli, php72w-cli Obsoletes: php73-cli, php73w-cli @@ -311,7 +309,7 @@ executing PHP scripts, /usr/bin/php, and the CGI interface. %package dbg Summary: The interactive PHP debugger Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php56u-dbg, php56w-phpdbg, php70u-dbg, php70w-phpdbg, php71u-dbg, php71w-phpdbg, php72u-dbg, php72w-phpdbg Obsoletes: php73-dbg, php73w-phpdbg Obsoletes: php74-dbg, php74w-phpdbg @@ -348,7 +346,7 @@ Requires(pre): /usr/sbin/useradd # Temporarily not mandatory to allow nginx for nginx repo Recommends: nginx-filesystem %endif -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-fpm, php53u-fpm, php54-fpm, php54w-fpm, php55u-fpm, php55w-fpm, php56u-fpm, php56w-fpm Obsoletes: php70u-fpm, php70w-fpm, php71u-fpm, php71w-fpm, php72u-fpm, php72w-fpm Obsoletes: php73-fpm, php73w-fpm @@ -365,7 +363,7 @@ any size, especially busier sites. %package litespeed Summary: LiteSpeed Web Server PHP support Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-litespeed, php53u-litespeed, php54-litespeed, php54w-litespeed, php55u-litespeed, php55w-litespeed, php56u-litespeed, php56w-litespeed Obsoletes: php70u-litespeed, php70w-litespeed, php71u-litespeed, php71w-litespeed, php72u-litespeed, php72w-litespeed Obsoletes: php73-litespeed, php73w-litespeed @@ -427,7 +425,7 @@ Obsoletes: php-pecl-Fileinfo < 1.0.5 Provides: php-pecl-Fileinfo = %{fileinfover}, php-pecl-Fileinfo%{?_isa} = %{fileinfover} Provides: php-pecl(Fileinfo) = %{fileinfover}, php-pecl(Fileinfo)%{?_isa} = %{fileinfover} Obsoletes: php-mhash < 5.3.0 -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-mhash, php53u-mhash Obsoletes: php53-common, php53u-common, php54-common, php54w-common, php55u-common, php55w-common, php56u-common, php56w-common Obsoletes: php70u-common, php70w-common, php71u-common, php71w-common, php72u-common, php72w-common @@ -469,14 +467,13 @@ Requires: openssl-devel%{?_isa} >= 1.0.2 Requires: pcre2-devel%{?_isa} %endif Requires: zlib-devel%{?_isa} -Obsoletes: php-pecl-pdo-devel Obsoletes: php-pecl-json-devel < %{version} Obsoletes: php-pecl-jsonc-devel < %{version} %if %{with zts} Provides: php-zts-devel = %{version}-%{release} Provides: php-zts-devel%{?_isa} = %{version}-%{release} %endif -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-devel, php53u-devel, php54-devel, php54w-devel, php55u-devel, php55w-devel, php56u-devel, php56w-devel Obsoletes: php55u-pecl-jsonc-devel, php56u-pecl-jsonc-devel Obsoletes: php70u-devel, php70w-devel, php71u-devel, php71w-devel, php72u-devel, php72w-devel @@ -497,12 +494,12 @@ need to install this package. Summary: The Zend OPcache License: PHP Requires: php-common%{?_isa} = %{version}-%{release} -Obsoletes: php-pecl-zendopcache +Obsoletes: php-pecl-zendopcache < 7.0.6 Provides: php-pecl-zendopcache = %{version} Provides: php-pecl-zendopcache%{?_isa} = %{version} Provides: php-pecl(opcache) = %{version} Provides: php-pecl(opcache)%{?_isa} = %{version} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php55u-opcache, php55w-opcache, php56u-opcache, php56w-opcache Obsoletes: php70u-opcache, php70w-opcache, php71u-opcache, php71w-opcache, php72u-opcache, php72w-opcache Obsoletes: php73-opcache, php73w-opcache @@ -522,12 +519,11 @@ Summary: A module for PHP applications that use IMAP # All files licensed under PHP version 3.01 License: PHP Requires: php-common%{?_isa} = %{version}-%{release} -Obsoletes: mod_php3-imap, stronghold-php-imap BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: openssl-devel >= 1.0.2 BuildRequires: libc-client-devel -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-imap, php53u-imap, php54-imap, php54w-imap, php55u-imap, php55w-imap, php56u-imap, php56w-imap Obsoletes: php70u-imap, php70w-imap, php71u-imap, php71w-imap, php72u-imap, php72w-imap Obsoletes: php73-imap, php73w-imap @@ -548,7 +544,7 @@ Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(libsasl2) BuildRequires: openldap-devel BuildRequires: openssl-devel >= 1.0.2 -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-ldap, php53u-ldap, php54-ldap, php54w-ldap, php55u-ldap, php55w-ldap, php56u-ldap, php56w-ldap Obsoletes: php70u-ldap, php70w-ldap, php71u-ldap, php71w-ldap, php72u-ldap, php72w-ldap Obsoletes: php73-ldap, php73w-ldap @@ -572,7 +568,7 @@ Provides: php-pdo-abi = %{pdover}-%{__isa_bits} Provides: php(pdo-abi) = %{pdover}-%{__isa_bits} Provides: php-sqlite3, php-sqlite3%{?_isa} Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-pdo, php53u-pdo, php54-pdo, php54w-pdo, php55u-pdo, php55w-pdo, php56u-pdo, php56w-pdo Obsoletes: php70u-pdo, php70w-pdo, php71u-pdo, php71w-pdo, php72u-pdo, php72w-pdo Obsoletes: php73-pdo, php73w-pdo @@ -596,7 +592,7 @@ Provides: php-mysqli = %{version}-%{release} Provides: php-mysqli%{?_isa} = %{version}-%{release} Provides: php-pdo_mysql, php-pdo_mysql%{?_isa} Obsoletes: php-mysql < %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-mysqlnd, php53u-mysqlnd, php54-mysqlnd, php54w-mysqlnd, php55u-mysqlnd, php55w-mysqlnd, php56u-mysqlnd, php56w-mysqlnd Obsoletes: php70u-mysqlnd, php70w-mysqlnd, php71u-mysqlnd, php71w-mysqlnd, php72u-mysqlnd, php72w-mysqlnd Obsoletes: php73-mysqlnd, php73w-mysqlnd @@ -625,7 +621,7 @@ Provides: php-pdo_pgsql, php-pdo_pgsql%{?_isa} BuildRequires: krb5-devel BuildRequires: openssl-devel >= 1.0.2 BuildRequires: postgresql-devel -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-pgsql, php53u-pgsql, php54-pgsql, php54w-pgsql, php55u-pgsql, php55w-pgsql, php56u-pgsql, php56w-pgsql Obsoletes: php70u-pgsql, php70w-pgsql, php71u-pgsql, php71w-pgsql, php72u-pgsql, php72w-pgsql Obsoletes: php73-pgsql, php73w-pgsql @@ -651,7 +647,7 @@ Provides: php-shmop, php-shmop%{?_isa} Provides: php-sysvsem, php-sysvsem%{?_isa} Provides: php-sysvshm, php-sysvshm%{?_isa} Provides: php-sysvmsg, php-sysvmsg%{?_isa} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-process, php53u-process, php54-process, php54w-process, php55u-process, php55w-process, php56u-process, php56w-process Obsoletes: php70u-process, php70w-process, php71u-process, php71w-process, php72u-process, php72w-process Obsoletes: php73-process, php73w-process @@ -674,7 +670,7 @@ Provides: php_database Provides: php-pdo_odbc, php-pdo_odbc%{?_isa} # EL-7 version don't have pkgconfig BuildRequires: unixODBC-devel -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-odbc, php53u-odbc, php54-odbc, php54w-odbc, php55u-odbc, php55w-odbc, php56u-odbc, php56w-odbc Obsoletes: php70u-odbc, php70w-odbc, php71u-odbc, php71w-odbc, php72u-odbc, php72w-odbc Obsoletes: php73-odbc, php73w-odbc @@ -697,7 +693,7 @@ Summary: A module for PHP applications that use the SOAP protocol License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(libxml-2.0) -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-soap, php53u-soap, php54-soap, php54w-soap, php55u-soap, php55w-soap, php56u-soap, php56w-soap Obsoletes: php70u-soap, php70w-soap, php71u-soap, php71w-soap, php72u-soap, php72w-soap Obsoletes: php73-soap, php73w-soap @@ -718,7 +714,7 @@ BuildRequires: firebird-devel Requires: php-pdo%{?_isa} = %{version}-%{release} Provides: php_database Provides: php-pdo_firebird, php-pdo_firebird%{?_isa} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-interbase, php53u-interbase, php54-interbase, php54w-interbase, php55u-interbase, php55w-interbase, php56u-interbase, php56w-interbase Obsoletes: php70u-interbase, php70w-interbase, php71u-interbase, php71w-interbase, php72u-interbase, php72w-interbase Obsoletes: php73-interbase, php73w-interbase @@ -747,7 +743,7 @@ Provides: php-pecl(oci8) = %{oci8ver} Provides: php-pecl(oci8)%{?_isa} = %{oci8ver} # Should requires libclntsh.so.18.3, but it's not provided by Oracle RPM. AutoReq: 0 -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-oci8, php53u-oci8, php54-oci8, php54w-oci8, php55u-oci8, php55w-oci8, php56u-oci8, php56w-oci8 Obsoletes: php70u-oci8, php70w-oci8, php71u-oci8, php71w-oci8, php72u-oci8, php72w-oci8 Obsoletes: php73-oci8, php73w-oci8 @@ -780,7 +776,7 @@ Summary: A module for PHP applications that query SNMP-managed devices License: PHP Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp BuildRequires: net-snmp-devel -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-snmp, php53u-snmp, php54-snmp, php54w-snmp, php55u-snmp, php55w-snmp, php56u-snmp, php56w-snmp Obsoletes: php70u-snmp, php70w-snmp, php71u-snmp, php71w-snmp, php72u-snmp, php72w-snmp Obsoletes: php73-snmp, php73w-snmp @@ -808,7 +804,7 @@ Provides: php-xsl, php-xsl%{?_isa} BuildRequires: pkgconfig(libxslt) >= 1.1 BuildRequires: pkgconfig(libexslt) BuildRequires: pkgconfig(libxml-2.0) >= 2.7.6 -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-xml, php53u-xml, php54-xml, php54w-xml, php55u-xml, php55w-xml, php56u-xml, php56w-xml Obsoletes: php70u-xml, php70w-xml, php71u-xml, php71w-xml, php72u-xml, php72w-xml Obsoletes: php73-xml, php73w-xml @@ -835,7 +831,7 @@ BuildRequires: oniguruma-devel %endif Provides: bundled(libmbfl) = 1.3.2 Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-mbstring, php53u-mbstring, php54-mbstring, php54w-mbstring, php55u-mbstring, php55w-mbstring, php56u-mbstring, php56w-mbstring Obsoletes: php70u-mbstring, php70w-mbstring, php71u-mbstring, php71w-mbstring, php72u-mbstring, php72w-mbstring Obsoletes: php73-mbstring, php73w-mbstring @@ -870,7 +866,7 @@ BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libavif) Provides: bundled(gd) = 2.0.35 %endif -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-gd, php53u-gd, php54-gd, php54w-gd, php55u-gd, php55w-gd, php56u-gd, php56w-gd Obsoletes: php70u-gd, php70w-gd, php71u-gd, php71w-gd, php72u-gd, php72w-gd Obsoletes: php73-gd, php73w-gd @@ -888,7 +884,7 @@ Summary: A module for PHP applications for using the bcmath library # libbcmath is licensed under LGPLv2+ License: PHP and LGPLv2+ Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-bcmath, php53u-bcmath, php54-bcmath, php54w-bcmath, php55u-bcmath, php55w-bcmath, php56u-bcmath, php56w-bcmath Obsoletes: php70u-bcmath, php70w-bcmath, php71u-bcmath, php71w-bcmath, php72u-bcmath, php72w-bcmath Obsoletes: php73-bcmath, php73w-bcmath @@ -907,7 +903,7 @@ Summary: A module for PHP applications for using the GNU MP library License: PHP BuildRequires: gmp-devel Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-gmp, php53u-gmp, php54-gmp, php54w-gmp, php55u-gmp, php55w-gmp, php56u-gmp, php56w-gmp Obsoletes: php70u-gmp, php70w-gmp, php71u-gmp, php71w-gmp, php72u-gmp, php72w-gmp Obsoletes: php73-gmp, php73w-gmp @@ -930,7 +926,7 @@ BuildRequires: lmdb-devel BuildRequires: qdbm-devel %endif Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-dba, php53u-dba, php54-dba, php54w-dba, php55u-dba, php55w-dba, php56u-dba, php56w-dba Obsoletes: php70u-dba, php70w-dba, php71u-dba, php71w-dba, php72u-dba, php72w-dba Obsoletes: php73-dba, php73w-dba @@ -948,7 +944,7 @@ Summary: Standard PHP module provides tidy library support License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: libtidy-devel -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-tidy, php53u-tidy, php54-tidy, php54w-tidy, php55u-tidy, php55w-tidy, php56u-tidy, php56w-tidy Obsoletes: php70u-tidy, php70w-tidy, php71u-tidy, php71w-tidy, php72u-tidy, php72w-tidy Obsoletes: php73-tidy, php73w-tidy @@ -968,7 +964,7 @@ Requires: php-pdo%{?_isa} = %{version}-%{release} BuildRequires: freetds-devel >= 0.91 Provides: php-pdo_dblib, php-pdo_dblib%{?_isa} Obsoletes: php-mssql < %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-mssql, php53u-mssql, php54-mssql, php54w-mssql, php55u-mssql, php55w-mssql, php56u-mssql, php56w-mssql Obsoletes: php70u-pdo-dblib, php70w-pdo_dblib, php71u-pdo-dblib, php71w-pdo_dblib, php72u-pdo-dblib, php72w-pdo_dblib Obsoletes: php73-pdo-dblib, php73w-pdo_dblib @@ -987,7 +983,7 @@ Requires: php-common%{?_isa} = %{version}-%{release} # doing a real -devel package for just the .so symlink is a bit overkill Provides: php-embedded-devel = %{version}-%{release} Provides: php-embedded-devel%{?_isa} = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-embedded, php53u-embedded, php54-embedded, php54w-embedded, php55u-embedded, php55w-embedded, php56u-embedded, php56w-embedded Obsoletes: php70u-embedded, php70w-embedded, php71u-embedded, php71w-embedded, php72u-embedded, php72w-embedded Obsoletes: php73-embedded, php73w-embedded @@ -1005,7 +1001,7 @@ Summary: A module for PHP applications for using pspell interfaces License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: aspell-devel >= 0.50.0 -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-pspell, php53u-pspell, php54-pspell, php54w-pspell, php55u-pspell, php55w-pspell, php56u-pspell, php56w-pspell Obsoletes: php70u-pspell, php70w-pspell, php71u-pspell, php71w-pspell, php72u-pspell, php72w-pspell Obsoletes: php73-pspell, php73w-pspell @@ -1025,7 +1021,7 @@ Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(icu-i18n) >= 71 BuildRequires: pkgconfig(icu-io) >= 71 BuildRequires: pkgconfig(icu-uc) >= 71 -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-intl, php53u-intl, php54-intl, php54w-intl, php55u-intl, php55w-intl, php56u-intl, php56w-intl Obsoletes: php70u-intl, php70w-intl, php71u-intl, php71w-intl, php72u-intl, php72w-intl Obsoletes: php73-intl, php73w-intl @@ -1043,7 +1039,7 @@ Summary: Enchant spelling extension for PHP applications License: PHP Requires: php-common%{?_isa} = %{version}-%{release} BuildRequires: pkgconfig(enchant-2) -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-enchant, php53u-enchant, php54-enchant, php54w-enchant, php55u-enchant, php55w-enchant, php56u-enchant, php56w-enchant Obsoletes: php70u-enchant, php70w-enchant, php71u-enchant, php71w-enchant, php72u-enchant, php72w-enchant Obsoletes: php73-enchant, php73w-enchant @@ -1066,7 +1062,7 @@ Provides: php-pecl(zip) = %{zipver} Provides: php-pecl(zip)%{?_isa} = %{zipver} Provides: php-pecl-zip = %{zipver} Provides: php-pecl-zip%{?_isa} = %{zipver} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php53-zip, php53u-zip, php54-zip, php54w-zip, php55u-zip, php55w-zip, php56u-zip, php56w-zip Obsoletes: php70u-zip, php70w-zip, php71u-zip, php71w-zip, php72u-zip, php72w-zip Obsoletes: php73-zip, php73w-zip @@ -1091,7 +1087,7 @@ Requires: php-common%{?_isa} = %{version}-%{release} Obsoletes: php-pecl-libsodium2 < 3 Provides: php-pecl(libsodium) = %{version} Provides: php-pecl(libsodium)%{?_isa} = %{version} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php72u-sodium, php72w-sodium Obsoletes: php73-sodium, php73w-sodium Obsoletes: php74-sodium, php74w-sodium @@ -1110,7 +1106,7 @@ License: PHP BuildRequires: pkgconfig(libffi) Requires: php-common%{?_isa} = %{version}-%{release} -%if 0%{?rhel} +%if 0%{?rhel} == 7 Obsoletes: php74-ffi, php74w-ffi Obsoletes: php80-ffi %endif @@ -1169,7 +1165,7 @@ in pure PHP. %patch5 -p1 -b .includedir %patch6 -p1 -b .embed %patch8 -p1 -b .libdb -%if 0%{?rhel} == 7 +%if 0%{?rhel} %patch10 -p1 -b .curltls %endif @@ -2181,6 +2177,9 @@ fi %changelog +* Wed Oct 26 2022 Remi Collet - 8.2.0~RC5-6 +- update to 8.2.0RC5 + * Tue Oct 11 2022 Remi Collet - 8.2.0~RC4-5 - update to 8.2.0RC4 -- cgit