From a67c40947eaa476040af3827f74a7f954fe883fe Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 9 Jun 2020 08:33:35 +0200
Subject: rebuild using oniguruma5php build phpdbg only once

---
 php-5.6.3-embed.patch |  2 +-
 php72.spec            | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/php-5.6.3-embed.patch b/php-5.6.3-embed.patch
index d9c04f6..38eea1d 100644
--- a/php-5.6.3-embed.patch
+++ b/php-5.6.3-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 embed fpm @PHP_INSTALLED_SAPIS@"
++php_sapis="apache2handler embed fpm phpdbg @PHP_INSTALLED_SAPIS@"
  
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do
diff --git a/php72.spec b/php72.spec
index 34e2266..92597c2 100644
--- a/php72.spec
+++ b/php72.spec
@@ -126,7 +126,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
@@ -798,8 +798,11 @@ Group: Development/Languages
 # ucgendat is licensed under OpenLDAP
 License: PHP and LGPLv2 and BSD and OpenLDAP
 %if %{with_onig}
-# ensure we have soname 5
-BuildRequires: oniguruma-devel >= 6.8
+%if 0%{?rhel}
+BuildRequires: oniguruma5php-devel
+%else
+BuildRequires: oniguruma-devel
+%endif
 %else
 Provides: bundled(oniguruma) = 6.3.0
 %endif
@@ -1477,6 +1480,7 @@ popd
 without_shared="--without-gd \
       --disable-dom --disable-dba --without-unixODBC \
       --disable-opcache \
+      --disable-phpdbg \
       --disable-json \
       --disable-xmlreader --disable-xmlwriter \
       --without-sodium \
@@ -2215,6 +2219,10 @@ fi
 
 
 %changelog
+* Tue Jun  9 2020 Remi Collet <remi@remirepo.net> - 7.2.31-2
+- rebuild using oniguruma5php
+- build phpdbg only once
+
 * Tue May 12 2020 Remi Collet <remi@remirepo.net> - 7.2.31-1
 - Update to 7.2.31 - http://www.php.net/releases/7_2_31.php
 
-- 
cgit