Merge branch 'master' into el6

This commit is contained in:
Tom Callaway 2017-06-30 11:30:28 -04:00
commit 28b40e2023
3 changed files with 13 additions and 6 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/pcre-8.40.tar.bz2 /pcre-8.40.tar.bz2
/curl-7.53.1.tar.bz2 /curl-7.53.1.tar.bz2
/R-3.4.0.tar.gz /R-3.4.0.tar.gz
/R-3.4.1.tar.gz

16
R.spec
View File

@ -95,7 +95,7 @@
%endif %endif
Name: R Name: R
Version: 3.4.0 Version: 3.4.1
Release: 1%{?dist} Release: 1%{?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
@ -268,14 +268,14 @@ Provides: R-class = 7.3.14
Provides: R-cluster = 2.0.6 Provides: R-cluster = 2.0.6
Provides: R-codetools = 0.2.15 Provides: R-codetools = 0.2.15
Provides: R-datasets = %{version} Provides: R-datasets = %{version}
Provides: R-foreign = 0.8.67 Provides: R-foreign = 0.8.69
Provides: R-graphics = %{version} Provides: R-graphics = %{version}
Provides: R-grDevices = %{version} Provides: R-grDevices = %{version}
Provides: R-grid = %{version} Provides: R-grid = %{version}
Provides: R-KernSmooth = 2.23.15 Provides: R-KernSmooth = 2.23.15
Provides: R-lattice = 0.20.35 Provides: R-lattice = 0.20.35
Provides: R-MASS = 7.3.47 Provides: R-MASS = 7.3.47
Provides: R-Matrix = 1.2.9 Provides: R-Matrix = 1.2.10
Obsoletes: R-Matrix < 0.999375-7 Obsoletes: R-Matrix < 0.999375-7
Provides: R-methods = %{version} Provides: R-methods = %{version}
Provides: R-mgcv = 1.8.17 Provides: R-mgcv = 1.8.17
@ -340,7 +340,7 @@ Requires: tex(cm-super-ts1.enc)
Requires: qpdf Requires: qpdf
%endif %endif
Provides: R-Matrix-devel = 1.2.9 Provides: R-Matrix-devel = 1.2.10
Obsoletes: R-Matrix-devel < 0.999375-7 Obsoletes: R-Matrix-devel < 0.999375-7
%if %{modern} %if %{modern}
@ -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,12 @@ R CMD javareconf \
%{_libdir}/libRmath.a %{_libdir}/libRmath.a
%changelog %changelog
* Fri Jun 30 2017 Tom Callaway <spot@fedoraproject.org> - 3.4.1-1
- update to 3.4.1
* 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

View File

@ -3,4 +3,4 @@ SHA512 (bzip2-1.0.6.tar.gz) = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ff
SHA512 (xz-5.2.3.tar.bz2) = 313af8a9eb919de1cd048482779c5ef4d8ebfad89e307f01732f77de4363db8f3cf48f4b737e02f233324d5da0ff7ddfe9a195673b84d0e29d4d456c34c78eef SHA512 (xz-5.2.3.tar.bz2) = 313af8a9eb919de1cd048482779c5ef4d8ebfad89e307f01732f77de4363db8f3cf48f4b737e02f233324d5da0ff7ddfe9a195673b84d0e29d4d456c34c78eef
SHA512 (pcre-8.40.tar.bz2) = b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 SHA512 (pcre-8.40.tar.bz2) = b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
SHA512 (curl-7.53.1.tar.bz2) = c668494d0e795f34b00505ca68ab41fbb475a1bccbcac1d0bbacbbbafa40a994472e100be18a0c10f8fa21b5b9bd3f4e66c1e68ff5423b13b82d829cbaefcd52 SHA512 (curl-7.53.1.tar.bz2) = c668494d0e795f34b00505ca68ab41fbb475a1bccbcac1d0bbacbbbafa40a994472e100be18a0c10f8fa21b5b9bd3f4e66c1e68ff5423b13b82d829cbaefcd52
SHA512 (R-3.4.0.tar.gz) = 5fe2780b5f751919e0cbb24724ae8f370aaa46161b5d4615a22cb8b4033ea30533a76ee10ead21815705db038fab8803964515a2de70000c41cf4d6b4993f8b5 SHA512 (R-3.4.1.tar.gz) = 19bd50c87dc001ef947c15c1760f27ac8986ff6b43c6d90d3093ae184e42963027ef06faf31ec57ac9e519af7a35a2f53f8ea23ef75d800ebbd02945cedc4651