fix patch41 not applied (use system nikic/php-parser when available)

Related: #2095752
This commit is contained in:
Remi Collet 2022-06-13 16:09:49 +02:00
parent 6d932863d7
commit 0bfd00cc6c

View File

@ -62,7 +62,7 @@
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
Name: php Name: php
Version: %{upver}%{?rcver:~%{rcver}} Version: %{upver}%{?rcver:~%{rcver}}
Release: 1%{?dist} Release: 2%{?dist}
# All files licensed under PHP version 3.01, except # All files licensed under PHP version 3.01, except
# Zend is licensed under Zend # Zend is licensed under Zend
# TSRM is licensed under BSD # TSRM is licensed under BSD
@ -712,6 +712,7 @@ in pure PHP.
%patch8 -p1 -b .libdb %patch8 -p1 -b .libdb
%patch9 -p1 -b .deprecated %patch9 -p1 -b .deprecated
%patch41 -p1 -b .syslib
%patch42 -p1 -b .systzdata %patch42 -p1 -b .systzdata
%patch43 -p1 -b .headers %patch43 -p1 -b .headers
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@ -1536,6 +1537,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
%changelog %changelog
* Mon Jun 13 2022 Remi Collet <rcollet@redhat.com> - 8.0.20-2
- fix patch41 not applied (use system nikic/php-parser when available)
* Mon Jun 13 2022 Remi Collet <rcollet@redhat.com> - 8.0.20-1 * Mon Jun 13 2022 Remi Collet <rcollet@redhat.com> - 8.0.20-1
- rebase to 8.0.20 #2095752 - rebase to 8.0.20 #2095752
- clean unneeded dependency on useradd command #2095447 - clean unneeded dependency on useradd command #2095447