Merge remote-tracking branch 'up/f31' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
8c5ea8bf1b
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -28,3 +28,4 @@
|
|||
/R-3.5.2.tar.gz
|
||||
/R-3.5.3.tar.gz
|
||||
/R-3.6.0.tar.gz
|
||||
/R-3.6.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# This script used to do something, now it doesn't.
|
||||
# Why are you reading this?
|
||||
|
||||
exit 0
|
||||
|
||||
35
R.spec
35
R.spec
|
|
@ -104,8 +104,6 @@
|
|||
%global texi2any 1
|
||||
%endif
|
||||
|
||||
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||
|
||||
%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
|
||||
%if 0%{?rhel} >= 7
|
||||
%global openblas 1
|
||||
|
|
@ -121,13 +119,11 @@
|
|||
%endif
|
||||
|
||||
Name: R
|
||||
Version: 3.6.0
|
||||
Release: 3.0.riscv64%{?dist}
|
||||
Version: 3.6.1
|
||||
Release: 1.0.riscv64%{?dist}
|
||||
Summary: A language for data analysis and graphics
|
||||
URL: http://www.r-project.org
|
||||
Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz
|
||||
Source1: macros.R
|
||||
Source2: R-make-search-index.sh
|
||||
%if %{texi2any}
|
||||
# If we have texi2any 5.1+, we can generate the docs on the fly.
|
||||
# If not, we're building for a very old target (RHEL 6 or older)
|
||||
|
|
@ -230,7 +226,7 @@ BuildRequires: blas-devel >= 3.0
|
|||
|
||||
BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
|
||||
BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
|
||||
BuildRequires: gcc-objc, pango-devel, xz-devel
|
||||
BuildRequires: pango-devel, xz-devel
|
||||
%if %{libicu}
|
||||
BuildRequires: libicu-devel
|
||||
%endif
|
||||
|
|
@ -715,14 +711,6 @@ echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
|||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library
|
||||
|
||||
# Install rpm helper macros
|
||||
mkdir -p $RPM_BUILD_ROOT%{macrosdir}/
|
||||
install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{macrosdir}/
|
||||
|
||||
# Install rpm helper script
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/
|
||||
install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/
|
||||
|
||||
# Fix multilib
|
||||
touch -r README ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES
|
||||
touch -r README doc/manual/*.pdf
|
||||
|
|
@ -791,7 +779,7 @@ mv %{buildroot}%{_libdir}/R/lib/libRblas.so %{buildroot}%{_libdir}/R/lib/libRref
|
|||
%if 0%{?zlibhack}
|
||||
# Most of these tests pass. Some don't. All pieces belong to you.
|
||||
%else
|
||||
%ifnarch ppc64 ppc64le armv7hl
|
||||
%ifnarch ppc64 ppc64le armv7hl riscv64
|
||||
# Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test.
|
||||
ulimit -s 16384
|
||||
TZ="Europe/Paris" make check
|
||||
|
|
@ -1177,11 +1165,9 @@ R CMD javareconf \
|
|||
%{_libdir}/R/COPYING
|
||||
# %%{_libdir}/R/NEWS*
|
||||
%{_libdir}/R/SVN-REVISION
|
||||
/usr/lib/rpm/R-make-search-index.sh
|
||||
%if %{texi2any}
|
||||
%{_infodir}/R-*.info*
|
||||
%endif
|
||||
%{macrosdir}/macros.R
|
||||
%{_mandir}/man1/*
|
||||
%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
|
||||
%docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
|
||||
|
|
@ -1216,8 +1202,17 @@ R CMD javareconf \
|
|||
%{_libdir}/libRmath.a
|
||||
|
||||
%changelog
|
||||
* Fri Jul 26 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.6.0-3.0.riscv64
|
||||
- Rebuild for new ICU
|
||||
* Tue Aug 20 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.6.1-1.0.riscv64
|
||||
- Disable tests on RISC-V (riscv64)
|
||||
|
||||
* Fri Aug 16 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.1-1
|
||||
- update to 3.6.1
|
||||
|
||||
* Sun Aug 11 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.6.0-5
|
||||
- Remove unused and nonfunctional macros and helper script
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Jul 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.6.0-3
|
||||
- Add automated dependency generator to R-devel
|
||||
|
|
|
|||
9
macros.R
9
macros.R
|
|
@ -1,9 +0,0 @@
|
|||
#
|
||||
# RPM macros for R packaging
|
||||
#
|
||||
|
||||
#
|
||||
# Make R search index.txt
|
||||
#
|
||||
%_R_make_search_index /usr/lib/rpm/R-make-search-index.sh
|
||||
|
||||
2
sources
2
sources
|
|
@ -3,4 +3,4 @@ SHA512 (bzip2-1.0.6.tar.gz) = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ff
|
|||
SHA512 (pcre-8.42.tar.bz2) = b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
|
||||
SHA512 (xz-5.2.4.tar.bz2) = 25a548c34a304ba51cdaa63813df0fa4ac2f3cf0ec6dc2d181ec5b62fe586090cd0f1c866ee7ba19e9b264ecabf9ca9f2f1dda7f95313546da4152f3cfaa7e6e
|
||||
SHA512 (curl-7.63.0.tar.bz2) = 2873ef57b15cf12e508626f4546f6e06450cb87b239be1d26d9b3a22f7533d76eebabb5fa00e7b8c5d7fc9854356997ce164afb069411d079b2b9f0bdb00db25
|
||||
SHA512 (R-3.6.0.tar.gz) = b2e17b909b6387abb964492e2e9370f913295ca7ac99bab0e965c43ed3c4635e27468c326fb2bca3c529b03c731b0170d9e777a194ad4d6c5a983c050223d8c8
|
||||
SHA512 (R-3.6.1.tar.gz) = fae7d114437c4b5d10fcb2a4265acd707ad2a4810eeb7c11e25caca1d85093a1495c2e13457b4894c1508830ec1b2be95379b7d54007cf3e574c2a9eea28ef80
|
||||
|
|
|
|||
Loading…
Reference in New Issue