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

[Orion Poplawski]

commit 7e98cfe05b6476c413c1834a7a180672b66360b7
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Sep 29 12:03:40 2014 -0600

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

 R.spec |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/R.spec b/R.spec
index 0b820b4..9232321 100644
--- a/R.spec
+++ b/R.spec
@@ -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 at 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 at redhat.com> - 3.1.1-6
 - Setting ulimit when running make check, to avoid segfault due to too small stack (needed on PPC64)