From 770a520e357bf0863dad2cb2be16bc6d9654afd0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 10 Jul 2015 10:47:04 -0400 Subject: [PATCH 1/2] BR: libcurl-devel --- R.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 753c151..db19bbe 100644 --- a/R.spec +++ b/R.spec @@ -51,7 +51,7 @@ Name: R Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -65,6 +65,18 @@ BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: pcre-devel, zlib-devel +%if 0%{?rhel} + # RHEL older than 6 + %if 0%{?rhel} < 6 + BuildRequires: curl-devel + # RHEL newer than 6 + %else + BuildRequires: libcurl-devel + %endif +# Fedora (assuming modern) +%else +BuildRequires: libcurl-devel +%endif # valgrind is available only on selected arches %ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 BuildRequires: valgrind-devel @@ -943,6 +955,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fru Jul 10 2015 Tom Callaway - 3.2.1-2 +- BR: libcurl-devel + * Thu Jun 18 2015 Tom Callaway - 3.2.1-1 - update to 3.2.1 From 5b8ce897d59023f441b6723629d1ae697a5a7b94 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 10 Jul 2015 10:48:03 -0400 Subject: [PATCH 2/2] BR: libcurl-devel --- R.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R.spec b/R.spec index db19bbe..3ad6a51 100644 --- a/R.spec +++ b/R.spec @@ -955,7 +955,7 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog -* Fru Jul 10 2015 Tom Callaway - 3.2.1-2 +* Fri Jul 10 2015 Tom Callaway - 3.2.1-2 - BR: libcurl-devel * Thu Jun 18 2015 Tom Callaway - 3.2.1-1