summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-07-31 08:20:07 +0200
committerRemi Collet <remi@php.net>2024-07-31 08:20:07 +0200
commit2968e8a2440cf5ef1bafb4abefbab7c1be2513be (patch)
treed34e4f27451ca26573f0abb63db863f3bdf8bd5e /php.spec
parent3fadc52c1d1f1060b5b5075d0ccca52c90a6913b (diff)
Update to 8.4.0alpha3
fix build with libedit reverting a readline fix
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec13
1 files changed, 11 insertions, 2 deletions
diff --git a/php.spec b/php.spec
index ef0210e..cfe2793 100644
--- a/php.spec
+++ b/php.spec
@@ -82,7 +82,7 @@
%global gh_owner php
%global gh_project php-src
%global upver 8.4.0
-%global rcver alpha2
+%global rcver alpha3
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -136,7 +136,7 @@ Patch43: php-8.4.0-systzdata-v24.patch
# + display PHP version backported from 8.4
Patch44: php-8.4.0-phpize.patch
# Use -lldap_r for OpenLDAP
-Patch45: php-7.4.0-ldap_r.patch
+Patch45: php-8.4.0-ldap_r.patch
# Ignore unsupported "threads" option on password_hash
Patch46: php-8.0.7-argon2.patch
# drop "Configure command" from phpinfo output
@@ -149,6 +149,7 @@ Patch48: php-8.3.0-openssl-ec-param.patch
# RC Patch
# Upstream fixes (100+)
+Patch100: upstream.patch
# Security fixes (200+)
@@ -192,6 +193,9 @@ BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
%if %{with dtrace}
BuildRequires: %{?dtsprefix}systemtap-sdt-devel
+%if 0%{?fedora} >= 41
+BuildRequires: %{?dtsprefix}systemtap-sdt-dtrace
+%endif
%endif
%if 0%{?gh_date}
BuildRequires: bison
@@ -839,6 +843,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch -P48 -p1 -b .ec-param
# upstream patches
+%patch -P100 -p1 -R
# security patches
@@ -1633,6 +1638,10 @@ fi
%changelog
+* Tue Jul 30 2024 Remi Collet <remi@remirepo.net> - 8.4.0~alpha3-1
+- Update to 8.4.0alpha3
+- fix build with libedit reverting a readline fix
+
* Wed Jul 17 2024 Remi Collet <remi@remirepo.net> - 8.4.0~alpha2-1
- Update to 8.4.0alpha2