summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt6
-rw-r--r--php-5.6.3-embed.patch2
-rw-r--r--php.spec15
3 files changed, 15 insertions, 8 deletions
diff --git a/failed.txt b/failed.txt
index 244ab1d..9d74adf 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.3.19RC1 (2020-05-28)
+===== 7.3.19 (2020-06-11)
$ grep -ar 'Tests failed' /var/lib/mock/scl73*/build.log
@@ -7,11 +7,9 @@ $ grep -ar 'Tests failed' /var/lib/mock/scl73*/build.log
/var/lib/mock/scl73el8x/build.log:Tests failed : 14
/var/lib/mock/scl73fc30x/build.log:Tests failed : 0
/var/lib/mock/scl73fc31x/build.log:Tests failed : 0
-/var/lib/mock/scl73fc32x/build.log:Tests failed : 1
+/var/lib/mock/scl73fc32x/build.log:Tests failed : 0
-fc32x
- 3 Bug #69900 Commandline input/output weird behaviour with STDIO [ext/standard/tests/streams/proc_open_bug69900.phpt]
el8x
5 buildroot issue with openssl under investigation
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/php.spec b/php.spec
index c86b768..830e955 100644
--- a/php.spec
+++ b/php.spec
@@ -136,7 +136,7 @@
%endif
%global upver 7.3.19
-%global rcver RC1
+#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -714,8 +714,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.9.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 \
@@ -1903,6 +1907,11 @@ fi
%changelog
+* Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 7.3.19-1
+- Update to 7.3.19 - http://www.php.net/releases/7_3_19.php
+- rebuild using oniguruma5php
+- build phpdbg only once
+
* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 7.3.19~RC1-1
- update to 7.3.19RC1