diff options
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php-8.5.0-parser.patch | 2 | ||||
| -rw-r--r-- | php.spec | 18 |
3 files changed, 13 insertions, 9 deletions
@@ -1,4 +1,4 @@ -===== 8.5.0beta1 (2025-08-14) +===== 8.5.0beta2 (2025-08-28) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php-8.5.0-parser.patch b/php-8.5.0-parser.patch index f9cf060..d103ff0 100644 --- a/php-8.5.0-parser.patch +++ b/php-8.5.0-parser.patch @@ -11,6 +11,6 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php + return; + } + - $version = "5.6.0"; + $version = "5.6.1"; $phpParserDir = __DIR__ . "/PHP-Parser-$version"; if (!is_dir($phpParserDir)) { @@ -94,8 +94,8 @@ %global gh_owner php %global gh_project php-src %global upver 8.5.0 -%global rcver beta1 -%global lowrc beta1 +%global rcver beta2 +%global lowrc beta2 # TODO set PHP_EXTRA_VERSION for EOL version Summary: PHP scripting language for creating dynamic web sites @@ -404,8 +404,8 @@ Requires: openssl-devel%{?_isa} >= 1.0.2 Requires: pcre2-devel%{?_isa} >= 10.30 %endif Requires: zlib-devel%{?_isa} -Recommends: php-nikic-php-parser5 >= 5.6.0 -Conflicts: php-nikic-php-parser5 < 5.6.0 +Recommends: php-nikic-php-parser5 >= 5.6.1 +Conflicts: php-nikic-php-parser5 < 5.6.1 %description devel The %{?scl_prefix}php-devel package contains the files needed for building PHP @@ -625,7 +625,11 @@ License: PHP-3.01 and MIT %endif Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} %if %{with libgd} +%if 0%{?rhel} +BuildRequires: gd3php-devel >= 2.3.3 +%else BuildRequires: pkgconfig(gdlib) >= 2.3.3 +%endif %else # Required to build the bundled GD library BuildRequires: pkgconfig(zlib) @@ -902,9 +906,6 @@ rm ext/openssl/tests/ecc_custom_params.phpt # Failing when build with PHP installed rm ext/opcache/tests/zzz_basic_logging.phpt -# TEMP -sed -e 's/-dev/beta1/' -i main/php_version.h - # Safety check for API version change. pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h) if test "x${pver}" != "x%{upver}%{?rcver}%{!?rcver:%{?gh_date:-dev}}"; then @@ -1641,6 +1642,9 @@ fi %changelog +* Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 8.5.0~beta2-1 +- update to 8.5.0beta2 + * Wed Aug 13 2025 Remi Collet <remi@remirepo.net> - 8.5.0~beta1-1 - update to 8.5.0beta1 |