diff options
| author | Remi Collet <remi@remirepo.net> | 2020-06-09 08:06:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-06-09 08:06:52 +0200 |
| commit | afc681ca1cd20435b801ecb31bc06391c4acc780 (patch) | |
| tree | 99de8eb68963c5b9018be5cbc920934d75323d17 | |
| parent | dab9e0cab46b22c5d0da2269fd2385db9cc53cf5 (diff) | |
rebuild using oniguruma5php
build phpdbg only once
| -rw-r--r-- | php-5.6.3-embed.patch | 2 | ||||
| -rw-r--r-- | php.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 @@ -141,7 +141,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}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 @@ -709,8 +709,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 @@ -1310,6 +1313,7 @@ popd without_shared="--without-gd \ --disable-dom --disable-dba --without-unixODBC \ --disable-opcache \ + --disable-phpdbg \ --disable-json \ --disable-xmlreader --disable-xmlwriter \ --without-sodium \ @@ -1905,6 +1909,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 |