From 90f427676a7a66f32112edf7e35a0ba2425942f7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jan 2026 08:44:58 +0100 Subject: Fedora: use system liburiparser --- php.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'php.spec') diff --git a/php.spec b/php.spec index 7e61839..725bcfc 100644 --- a/php.spec +++ b/php.spec @@ -89,8 +89,8 @@ %endif %global liburiparser_ver 1.0.0 -%if 0 -# yse system liburiparser when available +%if 0%{?fedora} >= 42 +# use system liburiparser when available %bcond_without liburiparser %else # use bundled library instead @@ -109,7 +109,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -170,6 +170,7 @@ Patch48: php-8.5.0-openssl-ec-param.patch # RC Patch # Upstream fixes (100+) +Patch100: upstream.patch # Security fixes (200+) @@ -870,6 +871,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 -b .liburiparser # security patches @@ -1658,6 +1660,9 @@ fi %changelog +* Mon Jan 5 2026 Remi Collet - 8.5.2~RC1-2 +- Fedora: use system liburiparser + * Wed Dec 31 2025 Remi Collet - 8.5.2~RC1-1 - update to 8.5.2RC1 -- cgit