Just BR/R java instead of java-1.5.0-gcj (bug #1110684)

This commit is contained in:
Orion Poplawski 2014-09-29 12:03:40 -06:00
parent 2617f03d5b
commit 4ed76e4bc4
1 changed files with 6 additions and 7 deletions

13
R.spec
View File

@ -40,7 +40,7 @@
Name: R
Version: 3.1.1
Release: 6%{?dist}
Release: 7%{?dist}
Summary: A language for data analysis and graphics
URL: http://www.r-project.org
Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
@ -57,11 +57,7 @@ BuildRequires: pcre-devel, zlib-devel
%if %{with_java_headless}
BuildRequires: java-headless
%else
%if %{modern}
BuildRequires: java-1.5.0-gcj
%else
BuildRequires: java-1.4.2-gcj-compat
%endif
BuildRequires: java
%endif
%if %{system_tre}
BuildRequires: tre-devel
@ -237,7 +233,7 @@ Requires(post): R-core = %{version}-%{release}
%if %{with_java_headless}
Requires(post): java-headless
%else
Requires(post): java-1.5.0-gcj
Requires(post): java
%endif
%description java
@ -913,6 +909,9 @@ R CMD javareconf \
%postun -n libRmath -p /sbin/ldconfig
%changelog
* Mon Sep 29 2014 Orion Poplawski <orion@cora.nwra.com> - 3.1.1-7
- Just BR/R java instead of java-1.5.0-gcj (bug #1110684)
* Tue Sep 16 2014 David Sommerseth <davids@redhat.com> - 3.1.1-6
- Setting ulimit when running make check, to avoid segfault due to too small stack (needed on PPC64)