From 3bba6d7aaef582b784ccf49de956a3802cc74849 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 9 Jun 2020 13:56:35 +0200
Subject: Update to 7.4.7 - http://www.php.net/releases/7_4_7.php rebuild using
oniguruma5php build phpdbg only once
---
failed.txt | 2 +-
php-7.4.0-embed.patch | 2 +-
php.spec | 18 +++++++++++-------
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/failed.txt b/failed.txt
index 82794e4..d030c33 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.4.7RC1 (2020-05-28)
+===== 7.4.7 (2020-06-11)
$ grep -ar 'Tests failed' /var/lib/mock/scl74*/build.log
diff --git a/php-7.4.0-embed.patch b/php-7.4.0-embed.patch
index 1c743c2..f7a9aaa 100644
--- a/php-7.4.0-embed.patch
+++ b/php-7.4.0-embed.patch
@@ -18,7 +18,7 @@ diff -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in
php_cgi_binary=NONE
configure_options="@CONFIGURE_OPTIONS@"
-php_sapis="@PHP_INSTALLED_SAPIS@"
-+php_sapis="apache2handler litespeed fpm @PHP_INSTALLED_SAPIS@"
++php_sapis="apache2handler litespeed fpm phpdbg @PHP_INSTALLED_SAPIS@"
ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
diff --git a/php.spec b/php.spec
index bb638f1..85abeda 100644
--- a/php.spec
+++ b/php.spec
@@ -81,7 +81,6 @@
%else
%global with_libpcre 0
%endif
-%global with_onig 1
%global with_dtrace 1
@@ -103,8 +102,8 @@
%global gh_owner php
%global gh_project php-src
%global upver 7.4.7
-%global rcver RC1
-%global lower RC1
+#global rcver RC1
+#global lower RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -690,11 +689,10 @@ Group: Development/Languages
# onigurama is licensed under BSD
# ucgendat is licensed under OpenLDAP
License: PHP and LGPLv2 and BSD and OpenLDAP
-%if %{with_onig}
-# ensure we have soname 5
-BuildRequires: pkgconfig(oniguruma) >= 6.8
+%if 0%{?rhel}
+BuildRequires: oniguruma5php-devel
%else
-Provides: bundled(oniguruma) = 6.9.3
+BuildRequires: oniguruma-devel
%endif
Provides: bundled(libmbfl) = 1.3.2
Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
@@ -1257,6 +1255,7 @@ popd
without_shared="--disable-gd \
--disable-dom --disable-dba --without-unixODBC \
--disable-opcache \
+ --disable-phpdbg \
--disable-json \
--without-ffi \
--disable-xmlreader --disable-xmlwriter \
@@ -1812,6 +1811,11 @@ fi
%changelog
+* Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 7.4.7-1
+- Update to 7.4.7 - http://www.php.net/releases/7_4_7.php
+- rebuild using oniguruma5php
+- build phpdbg only once
+
* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 7.4.7~RC1-1
- update to 7.4.7RC1
--
cgit