summaryrefslogtreecommitdiffstats
path: root/php85.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-01-05 08:44:51 +0100
committerRemi Collet <remi@php.net>2026-01-05 08:44:51 +0100
commit696e6e5c2283b9a4d9129127aef51fb8c61f162e (patch)
tree8f808e43a897a541f0c225a23f9fd1d889eea09e /php85.spec
parent2535e4d4526db253b3c4699166b4b8282ce11701 (diff)
Fedora: use system liburiparser
Diffstat (limited to 'php85.spec')
-rw-r--r--php85.spec11
1 files changed, 8 insertions, 3 deletions
diff --git a/php85.spec b/php85.spec
index 6682eab..e67ecc6 100644
--- a/php85.spec
+++ b/php85.spec
@@ -66,8 +66,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
@@ -96,7 +96,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: %{upver}%{?rcver:~%{rcver}}
-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
@@ -155,6 +155,7 @@ Patch48: php-8.5.0-openssl-ec-param.patch
# RC Patch
# Upstream fixes (100+)
+Patch100: upstream.patch
# Security fixes (200+)
@@ -1018,6 +1019,7 @@ in pure PHP.
%patch -P48 -p1 -b .ec-param
# upstream patches
+%patch -P100 -p1 -b .liburiparser
# security patches
@@ -1871,6 +1873,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%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