diff --git a/.gitignore b/.gitignore index b21dcad..2bc3e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,6 @@ /R-4.4.1.tar.gz /R-4.4.2.tar.gz /R-4.4.3.tar.gz +/R-4.5.0.tar.gz +/R-4.5.1.tar.gz +/R-4.5.2.tar.gz diff --git a/R.spec b/R.spec index b4ff275..a5aa2d1 100644 --- a/R.spec +++ b/R.spec @@ -27,11 +27,11 @@ # Should be the previous version, to make mass-rebuilds easier %bcond_with bootstrap -%global bootstrap_abi 4.3 +%global bootstrap_abi 4.4 %global major_version 4 -%global minor_version 4 -%global patch_version 3 +%global minor_version 5 +%global patch_version 2 Name: R Version: %{major_version}.%{minor_version}.%{patch_version} @@ -52,9 +52,8 @@ BuildRequires: libtiff-devel BuildRequires: cairo-devel BuildRequires: pango-devel BuildRequires: readline-devel -# Until upstream adds support for tcl/tk 9 -BuildRequires: tcl-devel < 1:9 -BuildRequires: tk-devel < 1:9 +BuildRequires: tcl-devel +BuildRequires: tk-devel BuildRequires: ncurses-devel BuildRequires: pcre2-devel BuildRequires: libcurl-devel @@ -62,6 +61,7 @@ BuildRequires: bzip2-devel BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: libdeflate-devel +BuildRequires: libzstd-devel BuildRequires: tre-devel BuildRequires: %{blaslib}-devel BuildRequires: libSM-devel @@ -112,6 +112,7 @@ and called at run time. %package core Summary: The minimal R components necessary for a functional runtime Requires: libRmath%{?_isa} = %{version}-%{release} +Requires: tzdata Requires: less Requires: xdg-utils Requires: zip, unzip @@ -139,24 +140,24 @@ Provides: R(ABI) = %{bootstrap_abi} print("Provides: R(" .. name .. ") = " .. rpm_version) } %add_submodule base %{version} -%add_submodule boot 1.3-31 +%add_submodule boot 1.3-32 %add_submodule class 7.3-23 -%add_submodule cluster 2.1.8 +%add_submodule cluster 2.1.8.1 %add_submodule codetools 0.2-20 %add_submodule compiler %{version} %add_submodule datasets %{version} -%add_submodule foreign 0.8-88 +%add_submodule foreign 0.8-90 %add_submodule graphics %{version} %add_submodule grDevices %{version} %add_submodule grid %{version} %add_submodule KernSmooth 2.23-26 -%add_submodule lattice 0.22-6 -%add_submodule MASS 7.3-64 -%add_submodule Matrix 1.7-2 +%add_submodule lattice 0.22-7 +%add_submodule MASS 7.3-65 +%add_submodule Matrix 1.7-4 Obsoletes: R-Matrix < 0.999375-7 %add_submodule methods %{version} -%add_submodule mgcv 1.9-1 -%add_submodule nlme 3.1-167 +%add_submodule mgcv 1.9-3 +%add_submodule nlme 3.1-168 %add_submodule nnet 7.3-20 %add_submodule parallel %{version} %add_submodule rpart 4.1.24 @@ -200,6 +201,7 @@ Requires: bzip2-devel Requires: xz-devel Requires: zlib-devel Requires: libdeflate-devel +Requires: libzstd-devel Requires: tre-devel Requires: %{blaslib}-devel Requires: libX11-devel @@ -217,7 +219,7 @@ Recommends: tex(inconsolata.sty) Recommends: qpdf %endif -Provides: R-Matrix-devel = 1.7.2 +Provides: R-Matrix-devel = 1.7.4 Obsoletes: R-Matrix-devel < 0.999375-7 %ifarch %{java_arches} @@ -306,11 +308,15 @@ from the R project. This package provides the static libRmath library. %prep %setup -q %patch -P0 -p1 -b .fixpath +# A bunch of macOS stuff in v4.5.2's archive +find . -name '._*' -delete %build # Comment out default R_LIBS_SITE (since R 4.2) and set our own as always sed -i -e '/R_LIBS_SITE=/s/^/#/g' etc/Renviron.in -echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/R/library:%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in +# Only packages which are needed as runtime dependencies are rebuilt for +# flatpaks in /app, build dependencies are from buildroot in /usr +echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/R/library:%{_libdir}/R/library:%{_datadir}/R/library%{?flatpak::/usr/%{_lib}/R/library:/usr/share/R/library}'"'}' >> etc/Renviron.in # No inconsolata on RHEL tex %if 0%{?rhel} export R_RD4PDF="times,hyper" @@ -398,6 +404,12 @@ for i in tex/latex bibtex/bib bibtex/bst; do (cd %{buildroot}%{_texdist}/$i && ln -s %{_datadir}/R/texmf/$i R) done +%if 0%{?flatpak} +# keep compatibility with shebang dependencies +mkdir -p %{buildroot}/usr/bin +ln -s /app/bin/Rscript %{buildroot}/usr/bin/Rscript +%endif + %check %if %{with tests} # Needed by tests/ok-error.R, which will smash the stack on PPC64. @@ -892,6 +904,7 @@ TZ="Europe/Paris" make check %{_libdir}/R/library/tools/Meta/ %{_libdir}/R/library/tools/NAMESPACE %{_libdir}/R/library/tools/R/ +%{_libdir}/R/library/tools/wre.txt # utils %dir %{_libdir}/R/library/utils/ %{_libdir}/R/library/utils/DESCRIPTION @@ -916,6 +929,9 @@ TZ="Europe/Paris" make check %{_pkgdocdir} %docdir %{_pkgdocdir} %{_sysconfdir}/ld.so.conf.d/* +%if 0%{?flatpak} +/usr/bin/Rscript +%endif %files core-devel %{_libdir}/pkgconfig/libR.pc @@ -946,6 +962,30 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Oct 31 2025 Iñaki Úcar - 4.5.2-1 +- Update to 4.5.2 + +* Tue Aug 05 2025 František Zatloukal - 4.5.1-3 +- Rebuilt for icu 77.1 + +* Wed Jul 23 2025 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jun 13 2025 Iñaki Úcar - 4.5.1-1 +- Update to 4.5.1 + +* Wed Apr 23 2025 Yaakov Selkowitz - 4.5.0-4 +- Fix flatpak build + +* Fri Apr 18 2025 Iñaki Úcar - 4.5.0-3 +- Add libzstd-devel to Requires + +* Fri Apr 18 2025 Iñaki Úcar - 4.5.0-2 +- Add tzdata to Requires + +* Fri Apr 18 2025 Iñaki Úcar - 4.5.0-1 +- Update to 4.5.0 + * Fri Feb 28 2025 Iñaki Úcar - 4.4.3-1 - Update to 4.4.3 diff --git a/sources b/sources index 64a07f3..b50315f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.4.3.tar.gz) = 2a1d1e5ee2e18c928e2b3e58df372083b4bbd0822863a8441404999209035436e236c8ffe3970827fbf3d765157365800ebb0bb46f361c6abe473ddec30be06f +SHA512 (R-4.5.2.tar.gz) = abc4ff1a1b18a1f480e7bceb3267074e30453b5a571034b4c2a1c53e1650a1bafaf86bc6ca37f117a2e4f6617039dedeedef4ba8743f38720fc70e4bed2ff0a4