summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-01-05 08:44:58 +0100
committerRemi Collet <remi@php.net>2026-01-05 08:44:58 +0100
commit90f427676a7a66f32112edf7e35a0ba2425942f7 (patch)
treef0b84d332a41c0834747e87a2b3cc4169f58126a /php.spec
parent9f217a504e1d85d13103c445ed1a689140aebfcf (diff)
Fedora: use system liburiparserHEADmaster
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec11
1 files changed, 8 insertions, 3 deletions
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 <remi@remirepo.net> - 8.5.2~RC1-2
+- Fedora: use system liburiparser
+
* Wed Dec 31 2025 Remi Collet <remi@remirepo.net> - 8.5.2~RC1-1
- update to 8.5.2RC1