Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

R.spec

@@ -148,7 +148,7 @@
 
 Name: R
 Version: 3.6.3
-Release: 1%{?dist}
+Release: 1.0.riscv64%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz
@@ -811,7 +811,7 @@ mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRref
 %if 0%{?zlibhack}
 # Most of these tests pass. Some don't. All pieces belong to you.
 %else
-%ifnarch ppc64 ppc64le armv7hl s390x aarch64
+%ifnarch ppc64 ppc64le armv7hl s390x aarch64 riscv64
 # Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test.
 ulimit -s 16384
 TZ="Europe/Paris" make check
@@ -1234,6 +1234,9 @@ R CMD javareconf \
 %{_libdir}/libRmath.a
 
 %changelog
+* Sat Apr 25 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.6.3-1.0.riscv64
+- Disable tests on RISC-V (riscv64)
+
 * Mon Mar  2 2020 Tom Callaway <spot@fedoraproject.org> - 3.6.3-1
 - update to 3.6.3
 - conditionalize lapack changes from previous commits to Fedora 32+ and EPEL-8