summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-11-25 08:28:26 +0100
committerRemi Collet <remi@php.net>2022-11-25 08:28:26 +0100
commit33144e7e80686d1f4a8458338174dcb9fb3b9d76 (patch)
treefb9c420607ffa8f1daef935a142ea40c0d312639 /php.spec
parent648b49c0ae762c9df007134e63d785d871ece2c9 (diff)
test build for GH-9997 with new upstream patch
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec13
1 files changed, 7 insertions, 6 deletions
diff --git a/php.spec b/php.spec
index f66a7af..3767a6e 100644
--- a/php.spec
+++ b/php.spec
@@ -129,7 +129,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 21%{?dist}
+Release: 22%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -969,9 +969,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch91 -p1 -b .remi-oci8
# upstream patches
-%if 0%{?rhel} == 7
-%patch100 -p1 -R
-%endif
+%patch100 -p1
# security patches
@@ -1852,8 +1850,11 @@ fi
%changelog
-* Thu Nov 24 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc7-20
-- test build for GH-9997
+* Fri Nov 25 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc7-22
+- test build for GH-9997 with new upstream patch
+
+* Thu Nov 24 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc7-21
+- test build for GH-9997 with upstream patch reverted
* Wed Nov 23 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc7-19
- update to 8.2.0RC7