summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php85.spec121
2 files changed, 63 insertions, 60 deletions
diff --git a/failed.txt b/failed.txt
index 3513963..b6d49fa 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.5.0RC3 (2025-10-23)
+===== 8.5.0RC4 (2025-11-06)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php85.spec b/php85.spec
index ffbd7d0..48ea162 100644
--- a/php85.spec
+++ b/php85.spec
@@ -88,7 +88,7 @@
%bcond_with zip
%global upver 8.5.0
-%global rcver RC3
+%global rcver RC4
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -243,8 +243,8 @@ Recommends: php-sodium%{?_isa} = %{version}-%{release}
Recommends: php-xml%{?_isa} = %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4 < %{version}-%{release}
-Obsoletes: php8.5 < %{version}-%{release}
+Obsoletes: php8.4 <= %{version}
+Obsoletes: php8.5 <= %{version}
Provides: php8.5 = %{version}-%{release}
Provides: php8.5%{?_isa} = %{version}-%{release}
%endif
@@ -270,8 +270,8 @@ Provides: php-cgi = %{version}-%{release}, php-cgi%{?_isa} = %{version}-%{releas
Provides: php-pcntl, php-pcntl%{?_isa}
Provides: php-readline, php-readline%{?_isa}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-cli < %{version}-%{release}
-Obsoletes: php8.5-cli < %{version}-%{release}
+Obsoletes: php8.4-cli <= %{version}
+Obsoletes: php8.5-cli <= %{version}
Provides: php8.5-cli = %{version}-%{release}
Provides: php8.5-cli%{?_isa} = %{version}-%{release}
%endif
@@ -285,8 +285,8 @@ executing PHP scripts, /usr/bin/php, and the CGI interface.
Summary: The interactive PHP debugger
Requires: php-common%{?_isa} = %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-dbg < %{version}-%{release}
-Obsoletes: php8.5-dbg < %{version}-%{release}
+Obsoletes: php8.4-dbg <= %{version}
+Obsoletes: php8.5-dbg <= %{version}
Provides: php8.5-dbg = %{version}-%{release}
Provides: php8.5-dbg%{?_isa} = %{version}-%{release}
%endif
@@ -317,8 +317,8 @@ Provides: php(httpd)
# Temporarily not mandatory to allow nginx for nginx repo
Recommends: nginx-filesystem
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-fpm < %{version}-%{release}
-Obsoletes: php8.5-fpm < %{version}-%{release}
+Obsoletes: php8.4-fpm <= %{version}
+Obsoletes: php8.5-fpm <= %{version}
Provides: php8.5-fpm = %{version}-%{release}
Provides: php8.5-fpm%{?_isa} = %{version}-%{release}
%endif
@@ -333,8 +333,8 @@ any size, especially busier sites.
Summary: LiteSpeed Web Server PHP support
Requires: php-common%{?_isa} = %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-litespeed < %{version}-%{release}
-Obsoletes: php8.5-litespeed < %{version}-%{release}
+Obsoletes: php8.4-litespeed <= %{version}
+Obsoletes: php8.5-litespeed <= %{version}
Provides: php8.5-litespeed = %{version}-%{release}
Provides: php8.5-litespeed%{?_isa} = %{version}-%{release}
%endif
@@ -407,8 +407,8 @@ Provides: php-pecl-Fileinfo = %{fileinfover}, php-pecl-Fileinfo%{?_isa} = %{fil
Provides: php-pecl(Fileinfo) = %{fileinfover}, php-pecl(Fileinfo)%{?_isa} = %{fileinfover}
Obsoletes: php-mhash < 5.3.0
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-common < %{version}-%{release}
-Obsoletes: php8.5-common < %{version}-%{release}
+Obsoletes: php8.4-common <= %{version}
+Obsoletes: php8.5-common <= %{version}
Provides: php8.5-common = %{version}-%{release}
Provides: php8.5-common%{?_isa} = %{version}-%{release}
%endif
@@ -444,8 +444,8 @@ Provides: php-zts-devel%{?_isa} = %{version}-%{release}
Recommends: php-nikic-php-parser5 >= 5.6.1
Conflicts: php-nikic-php-parser5 < 5.6.1
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-devel < %{version}-%{release}
-Obsoletes: php8.5-devel < %{version}-%{release}
+Obsoletes: php8.4-devel <= %{version}
+Obsoletes: php8.5-devel <= %{version}
Provides: php8.5-devel = %{version}-%{release}
Provides: php8.5-devel%{?_isa} = %{version}-%{release}
%endif
@@ -464,8 +464,8 @@ BuildRequires: pkgconfig(libsasl2)
BuildRequires: openldap-devel
BuildRequires: openssl-devel >= 1.0.2
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-ldap < %{version}-%{release}
-Obsoletes: php8.5-ldap < %{version}-%{release}
+Obsoletes: php8.4-ldap <= %{version}
+Obsoletes: php8.5-ldap <= %{version}
Provides: php8.5-ldap = %{version}-%{release}
Provides: php8.5-ldap%{?_isa} = %{version}-%{release}
%endif
@@ -487,8 +487,8 @@ Provides: php(pdo-abi) = %{pdover}-%{__isa_bits}
Provides: php-sqlite3, php-sqlite3%{?_isa}
Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-pdo < %{version}-%{release}
-Obsoletes: php8.5-pdo < %{version}-%{release}
+Obsoletes: php8.4-pdo <= %{version}
+Obsoletes: php8.5-pdo <= %{version}
Provides: php8.5-pdo = %{version}-%{release}
Provides: php8.5-pdo%{?_isa} = %{version}-%{release}
%endif
@@ -510,8 +510,8 @@ Provides: php-mysqli%{?_isa} = %{version}-%{release}
Provides: php-pdo_mysql, php-pdo_mysql%{?_isa}
Obsoletes: php-mysql < %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-mysqlnd < %{version}-%{release}
-Obsoletes: php8.5-mysqlnd < %{version}-%{release}
+Obsoletes: php8.4-mysqlnd <= %{version}
+Obsoletes: php8.5-mysqlnd <= %{version}
Provides: php8.5-mysqlnd = %{version}-%{release}
Provides: php8.5-mysqlnd%{?_isa} = %{version}-%{release}
%endif
@@ -536,8 +536,8 @@ BuildRequires: krb5-devel
BuildRequires: openssl-devel >= 1.0.2
BuildRequires: postgresql-devel
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-pgsql < %{version}-%{release}
-Obsoletes: php8.5-pgsql < %{version}-%{release}
+Obsoletes: php8.4-pgsql <= %{version}
+Obsoletes: php8.5-pgsql <= %{version}
Provides: php8.5-pgsql = %{version}-%{release}
Provides: php8.5-pgsql%{?_isa} = %{version}-%{release}
%endif
@@ -561,8 +561,8 @@ Provides: php-sysvsem, php-sysvsem%{?_isa}
Provides: php-sysvshm, php-sysvshm%{?_isa}
Provides: php-sysvmsg, php-sysvmsg%{?_isa}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-process < %{version}-%{release}
-Obsoletes: php8.5-process < %{version}-%{release}
+Obsoletes: php8.4-process <= %{version}
+Obsoletes: php8.5-process <= %{version}
Provides: php8.5-process = %{version}-%{release}
Provides: php8.5-process%{?_isa} = %{version}-%{release}
%endif
@@ -586,8 +586,8 @@ BuildRequires: pkgconfig(libiodbc)
BuildRequires: pkgconfig(odbc)
%endif
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-odbc < %{version}-%{release}
-Obsoletes: php8.5-odbc < %{version}-%{release}
+Obsoletes: php8.4-odbc <= %{version}
+Obsoletes: php8.5-odbc <= %{version}
Provides: php8.5-odbc = %{version}-%{release}
Provides: php8.5-odbc%{?_isa} = %{version}-%{release}
%endif
@@ -611,8 +611,8 @@ License: PHP-3.01
Requires: php-common%{?_isa} = %{version}-%{release}
BuildRequires: pkgconfig(libxml-2.0)
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-soap < %{version}-%{release}
-Obsoletes: php8.5-soap < %{version}-%{release}
+Obsoletes: php8.4-soap <= %{version}
+Obsoletes: php8.5-soap <= %{version}
Provides: php8.5-soap = %{version}-%{release}
Provides: php8.5-soap%{?_isa} = %{version}-%{release}
%endif
@@ -631,8 +631,8 @@ Requires: php-pdo%{?_isa} = %{version}-%{release}
Provides: php_database
Provides: php-pdo_firebird, php-pdo_firebird%{?_isa}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-pdo-firebird < %{version}-%{release}
-Obsoletes: php8.5-pdo-firebird < %{version}-%{release}
+Obsoletes: php8.4-pdo-firebird <= %{version}
+Obsoletes: php8.5-pdo-firebird <= %{version}
Provides: php8.5-pdo-firebird = %{version}-%{release}
Provides: php8.5-pdo-firebird%{?_isa} = %{version}-%{release}
%endif
@@ -649,8 +649,8 @@ License: PHP-3.01
Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp
BuildRequires: net-snmp-devel
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-snmp < %{version}-%{release}
-Obsoletes: php8.5-snmp < %{version}-%{release}
+Obsoletes: php8.4-snmp <= %{version}
+Obsoletes: php8.5-snmp <= %{version}
Provides: php8.5-snmp = %{version}-%{release}
Provides: php8.5-snmp%{?_isa} = %{version}-%{release}
%endif
@@ -676,8 +676,8 @@ BuildRequires: pkgconfig(libxslt) >= 1.1
BuildRequires: pkgconfig(libexslt)
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.6
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-xml < %{version}-%{release}
-Obsoletes: php8.5-xml < %{version}-%{release}
+Obsoletes: php8.4-xml <= %{version}
+Obsoletes: php8.5-xml <= %{version}
Provides: php8.5-xml = %{version}-%{release}
Provides: php8.5-xml%{?_isa} = %{version}-%{release}
%endif
@@ -702,8 +702,8 @@ BuildRequires: oniguruma-devel
Provides: bundled(libmbfl) = 1.3.2
Requires: php-common%{?_isa} = %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-mbstring < %{version}-%{release}
-Obsoletes: php8.5-mbstring < %{version}-%{release}
+Obsoletes: php8.4-mbstring <= %{version}
+Obsoletes: php8.5-mbstring <= %{version}
Provides: php8.5-mbstring = %{version}-%{release}
Provides: php8.5-mbstring%{?_isa} = %{version}-%{release}
%endif
@@ -740,8 +740,8 @@ BuildRequires: pkgconfig(libavif)
Provides: bundled(gd) = 2.0.35
%endif
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-gd < %{version}-%{release}
-Obsoletes: php8.5-gd < %{version}-%{release}
+Obsoletes: php8.4-gd <= %{version}
+Obsoletes: php8.5-gd <= %{version}
Provides: php8.5-gd = %{version}-%{release}
Provides: php8.5-gd%{?_isa} = %{version}-%{release}
%endif
@@ -758,8 +758,8 @@ License: PHP-3.01 AND LGPL-2.1-or-later
Requires: php-common%{?_isa} = %{version}-%{release}
Provides: bundled(libbcmath)
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-bcmath < %{version}-%{release}
-Obsoletes: php8.5-bcmath < %{version}-%{release}
+Obsoletes: php8.4-bcmath <= %{version}
+Obsoletes: php8.5-bcmath <= %{version}
Provides: php8.5-bcmath = %{version}-%{release}
Provides: php8.5-bcmath%{?_isa} = %{version}-%{release}
%endif
@@ -775,8 +775,8 @@ License: PHP-3.01
BuildRequires: gmp-devel
Requires: php-common%{?_isa} = %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-gmp < %{version}-%{release}
-Obsoletes: php8.5-gmp < %{version}-%{release}
+Obsoletes: php8.4-gmp <= %{version}
+Obsoletes: php8.5-gmp <= %{version}
Provides: php8.5-gmp = %{version}-%{release}
Provides: php8.5-gmp%{?_isa} = %{version}-%{release}
%endif
@@ -797,8 +797,8 @@ BuildRequires: qdbm-devel
%endif
Requires: php-common%{?_isa} = %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-dba < %{version}-%{release}
-Obsoletes: php8.5-dba < %{version}-%{release}
+Obsoletes: php8.4-dba <= %{version}
+Obsoletes: php8.5-dba <= %{version}
Provides: php8.5-dba = %{version}-%{release}
Provides: php8.5-dba%{?_isa} = %{version}-%{release}
%endif
@@ -814,8 +814,8 @@ License: PHP-3.01
Requires: php-common%{?_isa} = %{version}-%{release}
BuildRequires: libtidy-devel
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-tidy < %{version}-%{release}
-Obsoletes: php8.5-tidy < %{version}-%{release}
+Obsoletes: php8.4-tidy <= %{version}
+Obsoletes: php8.5-tidy <= %{version}
Provides: php8.5-tidy = %{version}-%{release}
Provides: php8.5-tidy%{?_isa} = %{version}-%{release}
%endif
@@ -833,8 +833,8 @@ BuildRequires: freetds-devel >= 0.91
Provides: php-pdo_dblib, php-pdo_dblib%{?_isa}
Obsoletes: php-mssql < %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-pdo-dblib < %{version}-%{release}
-Obsoletes: php8.5-pdo-dblib < %{version}-%{release}
+Obsoletes: php8.4-pdo-dblib <= %{version}
+Obsoletes: php8.5-pdo-dblib <= %{version}
Provides: php8.5-pdo-dblib = %{version}-%{release}
Provides: php8.5-pdo-dblib%{?_isa} = %{version}-%{release}
%endif
@@ -851,8 +851,8 @@ Requires: php-common%{?_isa} = %{version}-%{release}
Provides: php-embedded-devel = %{version}-%{release}
Provides: php-embedded-devel%{?_isa} = %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-embedded < %{version}-%{release}
-Obsoletes: php8.5-embedded < %{version}-%{release}
+Obsoletes: php8.4-embedded <= %{version}
+Obsoletes: php8.5-embedded <= %{version}
Provides: php8.5-embedded = %{version}-%{release}
Provides: php8.5-embedded%{?_isa} = %{version}-%{release}
%endif
@@ -870,8 +870,8 @@ BuildRequires: pkgconfig(icu-i18n) >= 74
BuildRequires: pkgconfig(icu-io) >= 74
BuildRequires: pkgconfig(icu-uc) >= 74
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-intl < %{version}-%{release}
-Obsoletes: php8.5-intl < %{version}-%{release}
+Obsoletes: php8.4-intl <= %{version}
+Obsoletes: php8.5-intl <= %{version}
Provides: php8.5-intl = %{version}-%{release}
Provides: php8.5-intl%{?_isa} = %{version}-%{release}
%endif
@@ -887,8 +887,8 @@ License: PHP-3.01
Requires: php-common%{?_isa} = %{version}-%{release}
BuildRequires: pkgconfig(enchant-2)
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-enchant < %{version}-%{release}
-Obsoletes: php8.5-enchant < %{version}-%{release}
+Obsoletes: php8.4-enchant <= %{version}
+Obsoletes: php8.5-enchant <= %{version}
Provides: php8.5-enchant = %{version}-%{release}
Provides: php8.5-enchant%{?_isa} = %{version}-%{release}
%endif
@@ -927,8 +927,8 @@ Obsoletes: php-pecl-libsodium2 < 3
Provides: php-pecl(libsodium) = %{version}
Provides: php-pecl(libsodium)%{?_isa} = %{version}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-sodium < %{version}-%{release}
-Obsoletes: php8.5-sodium < %{version}-%{release}
+Obsoletes: php8.4-sodium <= %{version}
+Obsoletes: php8.5-sodium <= %{version}
Provides: php8.5-sodium = %{version}-%{release}
Provides: php8.5-sodium%{?_isa} = %{version}-%{release}
%endif
@@ -946,8 +946,8 @@ BuildRequires: pkgconfig(libffi)
Requires: php-common%{?_isa} = %{version}-%{release}
%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi"
-Obsoletes: php8.4-ffi < %{version}-%{release}
-Obsoletes: php8.5-ffi < %{version}-%{release}
+Obsoletes: php8.4-ffi <= %{version}
+Obsoletes: php8.5-ffi <= %{version}
Provides: php8.5-ffi = %{version}-%{release}
Provides: php8.5-ffi%{?_isa} = %{version}-%{release}
%endif
@@ -1868,6 +1868,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog
+* Wed Nov 5 2025 Remi Collet <remi@remirepo.net> - 8.5.0~RC4-1
+- update to 8.5.0RC4
+
* Wed Oct 22 2025 Remi Collet <remi@remirepo.net> - 8.5.0~RC3-1
- update to 8.5.0RC3