From 8e7f3c53cd295e18a2ccf85a7e2dace17f2befc0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 7 Jul 2020 14:12:03 +0200
Subject: update to 8.0.0alpha2 display build system and provider in phpinfo

---
 php.spec | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index 5e12d62..8d4dbd5 100644
--- a/php.spec
+++ b/php.spec
@@ -102,13 +102,13 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.0.0
-%global rcver        alpha1
-%global lower        alpha1
+%global rcver        alpha2
+%global lower        %{rcver}
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 22%{?dist}
+Release: 23%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -146,7 +146,7 @@ Source53: 20-ffi.ini
 # Build fixes
 Patch1: php-7.4.0-httpd.patch
 Patch5: php-7.2.0-includedir.patch
-Patch6: php-7.4.0-embed.patch
+Patch6: php-8.0.0-embed.patch
 Patch8: php-7.4.0-libdb.patch
 Patch9: php-7.0.7-curl.patch
 
@@ -166,7 +166,6 @@ Patch47: php-5.6.3-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
-Patch100: https://github.com/php/php-src/commit/c9b9f525a929158736977d6bad938380cad29cc6.patch
 
 # Security fixes (200+)
 
@@ -873,8 +872,6 @@ in pure PHP.
 %patch9 -p1 -b .curltls
 %endif
 
-%patch100 -p1 -b .up100
-
 %patch41 -p1 -b .syslib
 %if 0%{?fedora} >= 30 || 0%{?rhel} >= 6
 %patch42 -p1 -b .systzdata
@@ -1026,6 +1023,10 @@ exit 1
 # Set build date from https://reproducible-builds.org/specs/source-date-epoch/
 export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
 export PHP_UNAME=$(uname)
+export PHP_BUILD_SYSTEM=$(cat /etc/redhat-release | sed -e 's/ Beta//')
+%if 0%{?vendor:1}
+export PHP_BUILD_PROVIDER="%{vendor}"
+%endif
 
 # Force use of system libtool:
 libtoolize --force --copy
@@ -1749,6 +1750,10 @@ fi
 
 
 %changelog
+* Tue Jul  7 2020 Remi Collet <remi@remirepo.net> - 8.0.0~alpha2-23
+- update to 8.0.0alpha2
+- display build system and provider in phpinfo
+
 * Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 8.0.0~alpha1-22
 - add upstream patch to use hash in gen_stub.php
 
-- 
cgit