Merge branch 'master' into epel7
This commit is contained in:
commit
d80ed4051c
7
R.spec
7
R.spec
@ -96,7 +96,7 @@
|
|||||||
|
|
||||||
Name: R
|
Name: R
|
||||||
Version: 3.4.0
|
Version: 3.4.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A language for data analysis and graphics
|
Summary: A language for data analysis and graphics
|
||||||
URL: http://www.r-project.org
|
URL: http://www.r-project.org
|
||||||
Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
|
Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
|
||||||
@ -727,7 +727,7 @@ mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRref
|
|||||||
%ifnarch ppc64 ppc64le
|
%ifnarch ppc64 ppc64le
|
||||||
# Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test.
|
# Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test.
|
||||||
ulimit -s 16384
|
ulimit -s 16384
|
||||||
make check
|
TZ="Europe/Paris" make check
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -1170,6 +1170,9 @@ R CMD javareconf \
|
|||||||
%{_libdir}/libRmath.a
|
%{_libdir}/libRmath.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 12 2017 José Matos <jamatos@fedoraproject.org> - 3.4.0-2
|
||||||
|
- add TZ="Europe/Paris" to please make check
|
||||||
|
|
||||||
* Sat Apr 22 2017 Tom Callaway <spot@fedoraproject.org> - 3.4.0-1
|
* Sat Apr 22 2017 Tom Callaway <spot@fedoraproject.org> - 3.4.0-1
|
||||||
- update to 3.4.0
|
- update to 3.4.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user