summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-24 12:53:26 +0200
committerRemi Collet <remi@remirepo.net>2019-09-24 12:53:26 +0200
commit694dfdefec1e75b5640c94eb96ae1296a69a834b (patch)
tree483847e1cd1d5d5e56727b05bb02c1413dfd0837
parente5b74220092514c6d0bd4d0bf690e8f8a2e45473 (diff)
Update to 7.3.10 - http://www.php.net/releases/7_3_10.php
-rw-r--r--failed.txt2
-rw-r--r--php73.spec12
2 files changed, 10 insertions, 4 deletions
diff --git a/failed.txt b/failed.txt
index bedca8d..1de302f 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.3.10RC1 (2019-09-12)
+===== 7.3.10 (2019-09-26)
$ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log
diff --git a/php73.spec b/php73.spec
index 564c972..c8c2e97 100644
--- a/php73.spec
+++ b/php73.spec
@@ -117,12 +117,12 @@
%endif
%global upver 7.3.10
-%global rcver RC1
+#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -466,6 +466,7 @@ Provides: php-zts-devel%{?_isa} = %{version}-%{release}
%endif
%if 0%{?rhel}
Obsoletes: php53-devel, php53u-devel, php54-devel, php54w-devel, php55u-devel, php55w-devel, php56u-devel, php56w-devel
+Obsoletes: php55u-pecl-jsonc-devel, php56u-pecl-jsonc-devel
Obsoletes: php70u-devel, php70w-devel, php71u-devel, php71w-devel, php72u-devel, php72w-devel
Obsoletes: php73-devel, php73w-devel
%endif
@@ -1211,9 +1212,11 @@ rm Zend/tests/bug68412.phpt
rm sapi/cli/tests/upload_2G.phpt
# tar issue
rm ext/zlib/tests/004-mb.phpt
-# avoid issue when 2 builds run simultaneously
+# avoid issue when 2 builds run simultaneously (keep 64321 for the SCL)
%ifarch x86_64
sed -e 's/64321/64322/' -i ext/openssl/tests/*.phpt
+%else
+sed -e 's/64321/64323/' -i ext/openssl/tests/*.phpt
%endif
# Safety check for API version change.
@@ -2241,6 +2244,9 @@ fi
%changelog
+* Tue Sep 24 2019 Remi Collet <remi@remirepo.net> - 7.3.10-1
+- Update to 7.3.10 - http://www.php.net/releases/7_3_10.php
+
* Wed Sep 11 2019 Remi Collet <remi@remirepo.net> - 7.3.10~RC1-2
- update to 7.3.10RC1 (new tag)
- add tarball signature check