This commit is contained in:
Tom spot Callaway 2022-07-27 11:13:01 -04:00
parent 8e252594fc
commit d2a5fc949a
3 changed files with 15 additions and 12 deletions

1
.gitignore vendored
View File

@ -47,3 +47,4 @@
/R-4.1.1.tar.gz
/R-4.1.2.tar.gz
/R-4.1.3.tar.gz
/R-4.2.1.tar.gz

24
R.spec
View File

@ -197,12 +197,12 @@ R CMD javareconf \\
%endif
%global major_version 4
%global minor_version 1
%global patch_version 3
%global minor_version 2
%global patch_version 1
Name: R
Version: %{major_version}.%{minor_version}.%{patch_version}
Release: 3%{?dist}
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-4/R-%{version}.tar.gz
@ -410,7 +410,7 @@ Provides: R(ABI) = %{major_version}.%{minor_version}
%add_submodule base %{version}
%add_submodule boot 1.3-28
%add_submodule class 7.3-20
%add_submodule cluster 2.1.2
%add_submodule cluster 2.1.3
%add_submodule codetools 0.2-18
%add_submodule compiler %{version}
%add_submodule datasets %{version}
@ -420,12 +420,12 @@ Provides: R(ABI) = %{major_version}.%{minor_version}
%add_submodule grid %{version}
%add_submodule KernSmooth 2.23-20
%add_submodule lattice 0.20-45
%add_submodule MASS 7.3-55
%add_submodule Matrix 1.4-0
%add_submodule MASS 7.3-57
%add_submodule Matrix 1.4-1
Obsoletes: R-Matrix < 0.999375-7
%add_submodule methods %{version}
%add_submodule mgcv 1.8-39
%add_submodule nlme 3.1-155
%add_submodule mgcv 1.8-40
%add_submodule nlme 3.1-157
%add_submodule nnet 7.3-17
%add_submodule parallel %{version}
%add_submodule rpart 4.1.16
@ -433,7 +433,7 @@ Obsoletes: R-Matrix < 0.999375-7
%add_submodule splines %{version}
%add_submodule stats %{version}
%add_submodule stats4 %{version}
%add_submodule survival 3.2-13
%add_submodule survival 3.3-1
%add_submodule tcltk %{version}
%add_submodule tools %{version}
%add_submodule translations %{version}
@ -499,7 +499,7 @@ Requires: tex(cm-super-ts1.enc)
Requires: qpdf
%endif
Provides: R-Matrix-devel = 1.4.0
Provides: R-Matrix-devel = 1.4.1
Obsoletes: R-Matrix-devel < 0.999375-7
%if %{modern} && %{usejava}
@ -1192,7 +1192,6 @@ fi
%{_libdir}/R/library/nlme/html/
%{_libdir}/R/library/nlme/INDEX
%{_libdir}/R/library/nlme/libs/
%{_libdir}/R/library/nlme/LICENCE
%{_libdir}/R/library/nlme/Meta/
%{_libdir}/R/library/nlme/mlbook/
%{_libdir}/R/library/nlme/NAMESPACE
@ -1321,6 +1320,9 @@ fi
%{_libdir}/libRmath.a
%changelog
* Wed Jul 27 2022 Tom Callaway <spot@fedoraproject.org> - 4.2.1-1
- update to 4.2.1
* Mon Jul 25 2022 Tom Callaway <spot@fedoraproject.org> - 4.1.3-3
- add new "usejava" conditional
- do not "usejava" when Fedora >= 37 and i686

View File

@ -3,4 +3,4 @@ SHA512 (bzip2-1.0.8.tar.gz) = 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc868
SHA512 (xz-5.2.5.tar.bz2) = 89e25ddf72427ee9608cbf2e9dbc24d592cb67a27f44ccf7d47e4d9405774444e9cfcd02ac4bcb92064860371ed31d3cfbecd5fe063f296ead607714c0a664a1
SHA512 (pcre-8.44.tar.bz2) = f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
SHA512 (curl-7.72.0.tar.bz2) = ca787b8890c485f3176b9d51b024d217d69f28c34ab84c4091a2fcbbe5f13346efd559e9bb507971aec0ecb6ec4ed5975d2722773015728b72d3f26a3574c312
SHA512 (R-4.1.3.tar.gz) = cb71cc6c9551cc9cef4819ed778a8d0ef40490ec2bed27669c8e93d464a93bef5e73c2a03a714db03c87112b291a752ec2d21194e5abef81d85cb6c62643127c
SHA512 (R-4.2.1.tar.gz) = c1baf46d22304c425dde79301183f80f99f2752300137b0b6f902c3e55e2419d5e9185c97de6e3c840a38f6345a6c334aa24161656d4a7f6fa01570390f1122f