summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-08-28 15:21:06 +0200
committerRemi Collet <remi@php.net>2025-08-28 15:21:06 +0200
commitc7c881f23694a23aa8478e6c7be1d516107f5e45 (patch)
tree18e48fb668c11f3005214a855fd863c168b1131f /php.spec
parentd06dd9337d67178f3b7e81198cd3156c9affe913 (diff)
update to 8.5.0beta2
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec18
1 files changed, 11 insertions, 7 deletions
diff --git a/php.spec b/php.spec
index 7349ac4..2cc3d09 100644
--- a/php.spec
+++ b/php.spec
@@ -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