|
|
@@ -1,5 +1,5 @@
|
|
|
%define pkg_name R
|
|
|
-%define pkg_version 3.5.3
|
|
|
+%define pkg_version 3.6.0
|
|
|
%define pkg_release 1%{?_dist_release}
|
|
|
|
|
|
Summary: A language for data analysis and graphics
|
|
|
@@ -13,10 +13,15 @@ Group: Applications/Edutainment
|
|
|
URL: http://www.r-project.org
|
|
|
|
|
|
Source0: https://cran.r-project.org/src/base/R-3/%{name}-%{version}.tar.gz
|
|
|
+Source1: Rprofile.site
|
|
|
# Patch0: R-release.diff.gz
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
-BuildRequires: gcc-c++
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
+%ifarch x86_64
|
|
|
+BuildRequires: clang
|
|
|
+%endif
|
|
|
+%endif
|
|
|
BuildRequires: gcc-gfortran libgfortran
|
|
|
BuildRequires: texinfo
|
|
|
|
|
|
@@ -50,6 +55,11 @@ BuildRequires: texlive-collection-fontsrecommended
|
|
|
%endif
|
|
|
BuildRequires: java-devel
|
|
|
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
+%ifarch x86_64
|
|
|
+Requires: clang
|
|
|
+%endif
|
|
|
+%endif
|
|
|
Requires: gcc-gfortran
|
|
|
Requires: libgfortran
|
|
|
Requires: libicu
|
|
|
@@ -161,8 +171,17 @@ export R_BROWSER="%{_bindir}/xdg-open"
|
|
|
export LD_LIBRARY_PATH=%{_libdir}/R/lib
|
|
|
%endif
|
|
|
|
|
|
+# Add PATHS to Renviron for R_LIBS_SITE
|
|
|
+echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:%{_libdir}/R/site-library:%{_libdir}/R/library'"'}' \
|
|
|
+ >> etc/Renviron.in
|
|
|
+
|
|
|
%{configure} --enable-R-shlib --with-tcltk \
|
|
|
--with-blas="-lblas" \
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
+%ifarch x86_64
|
|
|
+ CC=clang CXX=clang++ \
|
|
|
+%endif
|
|
|
+%endif
|
|
|
%if %{?_dist_release} == "vl6"
|
|
|
--with-tcl-config=%{_libdir}/tclConfig85.sh \
|
|
|
--with-tk-config=%{_libdir}/tkConfig85.sh \
|
|
|
@@ -218,6 +237,12 @@ pushd ${RPM_BUILD_ROOT}%{_libdir}/R/lib
|
|
|
%{__ln_s} %{_libdir}/libblas.so.3 libblas.so
|
|
|
popd
|
|
|
|
|
|
+# Add folders for R_LIBS_SITE
|
|
|
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_libdir}/R/site-library
|
|
|
+
|
|
|
+# install Rprofile.site
|
|
|
+%{__install} %{SOURCE1} ${RPM_BUILD_ROOT}%{_libdir}/R/etc
|
|
|
+
|
|
|
|
|
|
%check
|
|
|
%{__make} check
|
|
|
@@ -226,7 +251,9 @@ popd
|
|
|
%{__rm} -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
|
|
|
-%post -p %{_syssbindir}/ldconfig
|
|
|
+%post
|
|
|
+%{_syssbindir}/ldconfig
|
|
|
+%{__mkdir_p} %{_prefix}/local/lib/R/site-library
|
|
|
|
|
|
%preun
|
|
|
if [ "$1" = "0" ]
|
|
|
@@ -268,6 +295,13 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 26 2019 Toshiaki Ara <ara_t@384.jp> 3.6.0-1
|
|
|
+- update to 3.6.0
|
|
|
+- build using clang/clang++ for VineSeed (x86_64)
|
|
|
+- change install path for external library
|
|
|
+- add PATHS to Renviron for R_LIBS_SITE
|
|
|
+- set default CRAN mirror
|
|
|
+
|
|
|
* Mon Mar 11 2019 Toshiaki Ara <ara_t@384.jp> 3.5.3-1
|
|
|
- update to 3.5.3
|
|
|
|
ara_t