Use BR java
This commit is contained in:
parent
03a7b7638f
commit
086df36f1c
10
R.spec
10
R.spec
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
Name: R
|
Name: R
|
||||||
Version: 3.0.2
|
Version: 3.0.2
|
||||||
Release: 3%{?dist}
|
Release: 4%{?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
|
||||||
@ -34,7 +34,7 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel
|
|||||||
BuildRequires: tcl-devel, tk-devel, ncurses-devel
|
BuildRequires: tcl-devel, tk-devel, ncurses-devel
|
||||||
BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel
|
BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel
|
||||||
%if %{modern}
|
%if %{modern}
|
||||||
BuildRequires: java-1.5.0-gcj
|
BuildRequires: java
|
||||||
%else
|
%else
|
||||||
BuildRequires: java-1.4.2-gcj-compat
|
BuildRequires: java-1.4.2-gcj-compat
|
||||||
%endif
|
%endif
|
||||||
@ -819,11 +819,11 @@ R CMD javareconf \
|
|||||||
%postun -n libRmath -p /sbin/ldconfig
|
%postun -n libRmath -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jan 24 2014 Tom Callaway <spot@fedoraproject.org> - 3.0.2-4
|
* Fri Feb 7 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.2-4
|
||||||
- disable lto on non-modern targets (not just ppc)
|
- Use BR java
|
||||||
|
|
||||||
* Fri Jan 24 2014 Tom Callaway <spot@fedoraproject.org> - 3.0.2-3
|
* Fri Jan 24 2014 Tom Callaway <spot@fedoraproject.org> - 3.0.2-3
|
||||||
- disable lto on ppc/ppc64
|
- disable lto on non-modern targets (not just ppc)
|
||||||
|
|
||||||
* Fri Dec 20 2013 Tom Callaway <spot@fedoraproject.org> - 3.0.2-2
|
* Fri Dec 20 2013 Tom Callaway <spot@fedoraproject.org> - 3.0.2-2
|
||||||
- add --with-blas, --enable-lto to configure
|
- add --with-blas, --enable-lto to configure
|
||||||
|
Loading…
Reference in New Issue
Block a user