MOAR FIXES

This commit is contained in:
Tom Callaway 2014-04-29 20:18:30 -04:00
parent f335ce90ec
commit 7f46a77123
1 changed files with 7 additions and 4 deletions

11
R.spec
View File

@ -8,11 +8,13 @@
%global modern 0
%global with_lto 0
%global with_java_headless 0
%global system_tre 0
# We need to use system tre on F21+/RHEL7
%if 0%{?fedora} >= 21
%global system_tre 1
%global with_java_headless 1
%endif
%if 0%{?fedora} >= 19
@ -22,6 +24,7 @@
%if 0%{?rhel} >= 7
%global system_tre 1
%global with_lto 1
%global with_java_headless 1
%endif
%if 0%{?fedora}
@ -50,15 +53,15 @@ BuildRequires: gcc-c++, tex(latex), texinfo-tex
BuildRequires: libpng-devel, libjpeg-devel, readline-devel
BuildRequires: tcl-devel, tk-devel, ncurses-devel
BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel
%if %{modern}
%if 0%{?fedora} >= 21
%if %{with_java_headless}
BuildRequires: java-headless
%else
%if %{modern}
BuildRequires: java-1.5.0-gcj
%endif
%else
BuildRequires: java-1.4.2-gcj-compat
%endif
%endif
%if %{system_tre}
BuildRequires: tre-devel
BuildRequires: autoconf, automake, libtool
@ -216,7 +219,7 @@ environment.
Summary: R with Fedora provided Java Runtime Environment
Group: Applications/Engineering
Requires(post): R-core = %{version}-%{release}
%if 0%{?fedora} >= 21
%if %{with_java_headless}
Requires(post): java-headless
%else
Requires(post): java-1.5.0-gcj