Merge branch 'master' into el5

This commit is contained in:
Tom Callaway 2017-04-22 12:15:50 -07:00
commit 84a28f1f9a
3 changed files with 14 additions and 10 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/xz-5.2.3.tar.bz2
/pcre-8.40.tar.bz2
/curl-7.53.1.tar.bz2
/R-3.4.0.tar.gz

21
R.spec
View File

@ -95,7 +95,7 @@
%endif
Name: R
Version: 3.3.3
Version: 3.4.0
Release: 1%{?dist}
Summary: A language for data analysis and graphics
URL: http://www.r-project.org
@ -263,9 +263,9 @@ Requires: openblas-Rblas
# depend on one of these submodules rather than just R. These are provided for
# packager convenience.
Provides: R-base = %{version}
Provides: R-boot = 1.3.18
Provides: R-boot = 1.3.19
Provides: R-class = 7.3.14
Provides: R-cluster = 2.0.5
Provides: R-cluster = 2.0.6
Provides: R-codetools = 0.2.15
Provides: R-datasets = %{version}
Provides: R-foreign = 0.8.67
@ -273,21 +273,21 @@ Provides: R-graphics = %{version}
Provides: R-grDevices = %{version}
Provides: R-grid = %{version}
Provides: R-KernSmooth = 2.23.15
Provides: R-lattice = 0.20.34
Provides: R-MASS = 7.3.45
Provides: R-Matrix = 1.2.8
Provides: R-lattice = 0.20.35
Provides: R-MASS = 7.3.47
Provides: R-Matrix = 1.2.9
Obsoletes: R-Matrix < 0.999375-7
Provides: R-methods = %{version}
Provides: R-mgcv = 1.8.17
Provides: R-nlme = 3.1.131
Provides: R-nnet = 7.3.12
Provides: R-parallel = %{version}
Provides: R-rpart = 4.1.10
Provides: R-rpart = 4.1.11
Provides: R-spatial = 7.3.11
Provides: R-splines = %{version}
Provides: R-stats = %{version}
Provides: R-stats4 = %{version}
Provides: R-survival = 2.40.1
Provides: R-survival = 2.41.3
Provides: R-tcltk = %{version}
Provides: R-tools = %{version}
Provides: R-utils = %{version}
@ -340,7 +340,7 @@ Requires: tex(cm-super-ts1.enc)
Requires: qpdf
%endif
Provides: R-Matrix-devel = 1.2.8
Provides: R-Matrix-devel = 1.2.9
Obsoletes: R-Matrix-devel < 0.999375-7
%if %{modern}
@ -1170,6 +1170,9 @@ R CMD javareconf \
%{_libdir}/libRmath.a
%changelog
* Sat Apr 22 2017 Tom Callaway <spot@fedoraproject.org> - 3.4.0-1
- update to 3.4.0
* Wed Mar 8 2017 Tom Callaway <spot@fedoraproject.org> - 3.3.3-1
- update to 3.3.3

View File

@ -1,6 +1,6 @@
SHA512 (R-3.3.3.tar.gz) = bcb0d92fc0b22c13e345a2f660e3b3cc5810f6a07c8f2e37949c81308c2b8a5edc322df0394ece563888645442b6c01a3e1e7005aa60bd9beacc718200829e75
SHA512 (zlib-1.2.11.tar.gz) = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
SHA512 (bzip2-1.0.6.tar.gz) = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
SHA512 (xz-5.2.3.tar.bz2) = 313af8a9eb919de1cd048482779c5ef4d8ebfad89e307f01732f77de4363db8f3cf48f4b737e02f233324d5da0ff7ddfe9a195673b84d0e29d4d456c34c78eef
SHA512 (pcre-8.40.tar.bz2) = b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
SHA512 (curl-7.53.1.tar.bz2) = c668494d0e795f34b00505ca68ab41fbb475a1bccbcac1d0bbacbbbafa40a994472e100be18a0c10f8fa21b5b9bd3f4e66c1e68ff5423b13b82d829cbaefcd52
SHA512 (R-3.4.0.tar.gz) = 5fe2780b5f751919e0cbb24724ae8f370aaa46161b5d4615a22cb8b4033ea30533a76ee10ead21815705db038fab8803964515a2de70000c41cf4d6b4993f8b5