merge fix
This commit is contained in:
commit
433f619b3b
20
R.spec
20
R.spec
@ -81,14 +81,22 @@
|
|||||||
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||||
|
|
||||||
%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
|
%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
|
||||||
|
%if 0%{?rhel} >= 7
|
||||||
%global openblas 1
|
%global openblas 1
|
||||||
%else
|
%else
|
||||||
|
%if 0%{?fedora} >= 23
|
||||||
|
%global openblas 1
|
||||||
|
%else
|
||||||
|
%global openblas 0
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
%else
|
||||||
%global openblas 0
|
%global openblas 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: R
|
Name: R
|
||||||
Version: 3.3.2
|
Version: 3.3.2
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: A language for data analysis and graphics
|
Summary: A language for data analysis and graphics
|
||||||
URL: http://www.r-project.org
|
URL: http://www.r-project.org
|
||||||
Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
|
Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
|
||||||
@ -248,10 +256,7 @@ Requires: perl, sed, gawk, tex(latex), less, make, unzip
|
|||||||
Requires: libRmath%{?_isa} = %{version}-%{release}
|
Requires: libRmath%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%if %{openblas}
|
%if %{openblas}
|
||||||
Requires: openblas
|
Requires: openblas-Rblas
|
||||||
# I assure you. Lying about this is MUCH easier than filtering it out.
|
|
||||||
Provides: libRblas.so()(%{__isa_bits}bit)
|
|
||||||
Provides: libRblas.so
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# These are the submodules that R-core provides. Sometimes R modules say they
|
# These are the submodules that R-core provides. Sometimes R modules say they
|
||||||
@ -713,8 +718,6 @@ sed -i 's|/builddir/build/BUILD/R-%{version}/curl-%{curlv}/target%{_libdir}/:/bu
|
|||||||
%if %{openblas}
|
%if %{openblas}
|
||||||
# Rename the R blas so.
|
# Rename the R blas so.
|
||||||
mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRrefblas.so
|
mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRrefblas.so
|
||||||
# Set a symlink to openblas
|
|
||||||
ln -s %{_libdir}/libopenblas.so.0 %{buildroot}%{_libdir}/R/lib/libRblas.so
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
@ -1165,6 +1168,9 @@ R CMD javareconf \
|
|||||||
%{_libdir}/libRmath.a
|
%{_libdir}/libRmath.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 14 2016 Tom Callaway <spot@fedoraproject.org> - 3.3.2-3
|
||||||
|
- openblas-Rblas provides libRblas.so now
|
||||||
|
|
||||||
* Mon Oct 31 2016 Tom Callaway <spot@fedoraproject.org> - 3.3.2-2
|
* Mon Oct 31 2016 Tom Callaway <spot@fedoraproject.org> - 3.3.2-2
|
||||||
- fix provides for openblas hack
|
- fix provides for openblas hack
|
||||||
- fix version for recommended components that are included
|
- fix version for recommended components that are included
|
||||||
|
Loading…
Reference in New Issue
Block a user