This commit is contained in:
Tom Callaway 2020-05-29 12:18:38 -04:00
parent 0a70cd5f99
commit ac049188bd
3 changed files with 24 additions and 9 deletions

1
.gitignore vendored
View File

@ -34,3 +34,4 @@
/pcre-8.43.tar.bz2
/curl-7.67.0.tar.bz2
/R-3.6.3.tar.gz
/R-4.0.0.tar.gz

30
R.spec
View File

@ -146,12 +146,16 @@
%global texi2any 1
%endif
%global major_version 4
%global minor_version 0
%global patch_version 0
Name: R
Version: 3.6.3
Version: %{major_version}.%{minor_version}.%{patch_version}
Release: 1%{?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
Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz
%if %{texi2any}
# If we have texi2any 5.1+, we can generate the docs on the fly.
# If not, we're building for a very old target (RHEL 6 or older)
@ -316,6 +320,10 @@ Requires: openblas-Rblas
Requires: devtoolset-%{dts_version}-toolchain
%endif
# This is our ABI provides to prevent mismatched installs.
# R packages should autogenerate a Requires: R(ABI) based on the R they were built against.
Provides: R(ABI) = %{major_version}.%{minor_version}
# These are the submodules that R-core provides. Sometimes R modules say they
# depend on one of these submodules rather than just R. These are provided for
# packager convenience.
@ -328,31 +336,31 @@ Requires: devtoolset-%{dts_version}-toolchain
}
%add_submodule base %{version}
%add_submodule boot 1.3-24
%add_submodule class 7.3-15
%add_submodule class 7.3-16
%add_submodule cluster 2.1.0
%add_submodule codetools 0.2-16
%add_submodule compiler %{version}
%add_submodule datasets %{version}
%add_submodule foreign 0.8-75
%add_submodule foreign 0.8-78
%add_submodule graphics %{version}
%add_submodule grDevices %{version}
%add_submodule grid %{version}
%add_submodule KernSmooth 2.23-16
%add_submodule lattice 0.20-38
%add_submodule lattice 0.20-41
%add_submodule MASS 7.3-51.5
%add_submodule Matrix 1.2-18
Obsoletes: R-Matrix < 0.999375-7
%add_submodule methods %{version}
%add_submodule mgcv 1.8-31
%add_submodule nlme 3.1-144
%add_submodule nnet 7.3-12
%add_submodule nlme 3.1-147
%add_submodule nnet 7.3-13
%add_submodule parallel %{version}
%add_submodule rpart 4.1-15
%add_submodule spatial 7.3-11
%add_submodule splines %{version}
%add_submodule stats %{version}
%add_submodule stats4 %{version}
%add_submodule survival 3.1-8
%add_submodule survival 3.1-12
%add_submodule tcltk %{version}
%add_submodule tools %{version}
%add_submodule translations %{version}
@ -952,6 +960,7 @@ R CMD javareconf \
%lang(de) %{_libdir}/R/library/class/po/de/
%lang(en) %{_libdir}/R/library/class/po/en*/
%lang(fr) %{_libdir}/R/library/class/po/fr/
%lang(it) %{_libdir}/R/library/class/po/it/
%lang(ko) %{_libdir}/R/library/class/po/ko/
%lang(pl) %{_libdir}/R/library/class/po/pl/
%{_libdir}/R/library/class/R/
@ -1234,6 +1243,11 @@ R CMD javareconf \
%{_libdir}/libRmath.a
%changelog
* Fri May 8 2020 Tom Callaway <spot@fedoraproject.org> - 4.0.0-1
- update to 4.0.0
NOTE: This major release update requires all installed R modules to be rebuilt in order to work.
To help with this, we've added an R(ABI) Provides/Requires setup.
* 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

View File

@ -3,4 +3,4 @@ SHA512 (xz-5.2.4.tar.bz2) = 25a548c34a304ba51cdaa63813df0fa4ac2f3cf0ec6dc2d181ec
SHA512 (bzip2-1.0.8.tar.gz) = 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
SHA512 (pcre-8.43.tar.bz2) = 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
SHA512 (curl-7.67.0.tar.bz2) = 096e12be86bca1c19ba9e1d98b8342ec0d76b2e00cab322a7109d1e3559343ff7702b993c772f221fa073d2b8b6ffe6535d15411819fb245d3fa2c18e110b0a5
SHA512 (R-3.6.3.tar.gz) = 9b1dc78922e431bd1af81e6e560b10ad04d121718f680fed32db735d561fd40ea6028759976722db11559f1a78fe684119b766f0567128cb2ee5003aa87a0931
SHA512 (R-4.0.0.tar.gz) = fa8b684fd0c8a1c9784b8e0e749b34141e513a83d4f3b6792cdf97826264191e7484f6705014974c9268570e717e1a1d39f6a88225fc751189b6f51e1a303163