epel fixes
This commit is contained in:
parent
07fac606e4
commit
b2423e500b
13
R.spec
13
R.spec
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
Name: R
|
Name: R
|
||||||
Version: 3.1.0
|
Version: 3.1.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?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
|
||||||
@ -44,8 +44,12 @@ 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}
|
||||||
|
%if 0%{?fedora} >= 21
|
||||||
BuildRequires: java-headless
|
BuildRequires: java-headless
|
||||||
%else
|
%else
|
||||||
|
BuildRequires: java-1.5.0-gcj
|
||||||
|
%endif
|
||||||
|
%else
|
||||||
BuildRequires: java-1.4.2-gcj-compat
|
BuildRequires: java-1.4.2-gcj-compat
|
||||||
%endif
|
%endif
|
||||||
%if %{system_tre}
|
%if %{system_tre}
|
||||||
@ -205,7 +209,11 @@ environment.
|
|||||||
Summary: R with Fedora provided Java Runtime Environment
|
Summary: R with Fedora provided Java Runtime Environment
|
||||||
Group: Applications/Engineering
|
Group: Applications/Engineering
|
||||||
Requires(post): R-core = %{version}-%{release}
|
Requires(post): R-core = %{version}-%{release}
|
||||||
|
%if 0%{?fedora} >= 21
|
||||||
Requires(post): java-headless
|
Requires(post): java-headless
|
||||||
|
%else
|
||||||
|
Requires(post): java-1.5.0-gcj
|
||||||
|
%endif
|
||||||
|
|
||||||
%description java
|
%description java
|
||||||
A language and environment for statistical computing and graphics.
|
A language and environment for statistical computing and graphics.
|
||||||
@ -850,6 +858,9 @@ R CMD javareconf \
|
|||||||
%postun -n libRmath -p /sbin/ldconfig
|
%postun -n libRmath -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 29 2014 Tom Callaway <spot@fedoraproject.org> - 3.1.0-3
|
||||||
|
- epel fixes
|
||||||
|
|
||||||
* Fri Apr 25 2014 Tom Callaway <spot@fedoraproject.org> - 3.1.0-2
|
* Fri Apr 25 2014 Tom Callaway <spot@fedoraproject.org> - 3.1.0-2
|
||||||
- fix core-devel Requires
|
- fix core-devel Requires
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user