| |
@@ -15,22 +15,6 @@
|
| |
%global java_arch %{_arch}
|
| |
%endif
|
| |
|
| |
- # Assume not modern. Override if needed.
|
| |
- %global modern 0
|
| |
-
|
| |
- # Track if we're hardening (all current fedora and RHEL 7+)
|
| |
- %global hardening 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
|
| |
-
|
| |
# We need this on old EL for C++11 support.
|
| |
%if 0%{?rhel} && 0%{?rhel} <= 7
|
| |
%global use_devtoolset 1
|
| |
@@ -46,13 +30,20 @@
|
| |
%global dts_version 7
|
| |
%endif
|
| |
|
| |
- # Using lto breaks debuginfo.
|
| |
- # %%if 0%%{?fedora} >= 19
|
| |
- # %%global with_lto 1
|
| |
- # %%endif
|
| |
+ # Assume not modern. Override if needed.
|
| |
+ %global modern 0
|
| |
|
| |
- %if 0%{?rhel} >= 7
|
| |
+ # Track if we're hardening (all current fedora and RHEL 7+)
|
| |
+ %global hardening 0
|
| |
+
|
| |
+ %global with_lto 0
|
| |
+ %global with_java_headless 0
|
| |
+
|
| |
+ %global system_tre 0
|
| |
+ # We need to use system tre on Fedora/RHEL7+
|
| |
+ %if 0%{?fedora} || 0%{?rhel} >= 7
|
| |
%global system_tre 1
|
| |
+ # Using lto breaks debuginfo.
|
| |
# %%global with_lto 1
|
| |
%global with_java_headless 1
|
| |
%global hardening 1
|
| |
@@ -60,7 +51,6 @@
|
| |
|
| |
%if 0%{?fedora}
|
| |
%global modern 1
|
| |
- %global hardening 1
|
| |
%endif
|
| |
|
| |
%if 0%{?rhel} >= 6
|
| |
@@ -121,6 +111,7 @@
|
| |
Name: R
|
| |
Version: 3.6.1
|
| |
Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
Summary: A language for data analysis and graphics
|
| |
URL: http://www.r-project.org
|
| |
Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz
|
| |
@@ -1202,6 +1193,9 @@
|
| |
%{_libdir}/libRmath.a
|
| |
|
| |
%changelog
|
| |
+ * Fri Aug 23 2019 Orion Poplawski <orion@nwra.com> - 3.6.1-1
|
| |
+ - gcc-objc is only needed for Aqua support on Macs, drop BR
|
| |
+
|
| |
* Fri Aug 16 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.1-1
|
| |
- update to 3.6.1
|
| |
|
| |
orion
commented 4 years ago
RHEL8 does not ship gcc-objc, which prompted this. It appears that objective-C is only needed for building Aqua support for the Mac, so I dropped the BR. I also tidied up the conditionals around the system_tre and other macros to hopefully improve grouping and clarity. I've requested an epel8 branch and plan to build this there when ready.