From 80e8f3bb8079d444c416af606a5fd1a1eeed3f6a Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 8 Aug 2022 10:26:38 -0400 Subject: [PATCH] fix issue in Renviron where R_LIBS_SITE was not being set properly --- R.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 042edd7..9943581 100644 --- a/R.spec +++ b/R.spec @@ -206,7 +206,7 @@ R CMD javareconf \\ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 1%{?dist} +Release: 2%{?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 @@ -665,6 +665,10 @@ popd . /opt/rh/devtoolset-%{dts_version}/enable %endif +# Disable R_LIBS_SITE force to an empty string (we always define it at the end if not set, and this breaks that) +# Thanks R 4.2 +sed -i "s|R_LIBS_SITE=\${R_LIBS_SITE:-'%%S'}|#R_LIBS_SITE=\${R_LIBS_SITE:-'%%S'}|g" etc/Renviron.in + # Add PATHS to Renviron for R_LIBS_SITE 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 # No inconsolata on RHEL tex @@ -1326,6 +1330,10 @@ fi %{_libdir}/libRmath.a %changelog +* Mon Aug 8 2022 Tom Callaway - 4.2.1-2 +- fix issue where Renviron was setting R_LIBS_SITE to an empty string, which makes it hard to find Fedora's noarch + packages being installed into /usr/share. + * Wed Jul 27 2022 Tom Callaway - 4.2.1-1 - update to 4.2.1 - disable the R test suite due to unknown failures on i686/x86_64 in koji (and only in koji)