conditionalize macro usage so that it only happens on Fedora 31+ and EPEL-8

This commit is contained in:
Tom Callaway 2019-08-30 07:47:29 -04:00
parent 02916c034f
commit 56020a5336

48
R.spec
View File

@ -3,6 +3,16 @@
%global runjavareconf 1 %global runjavareconf 1
%if %{?fedora} >= 31
%global usemacros 1
%else
%if 0%{?rhel} && 0%{?rhel} >= 8
%global usemacros 1
%else
%global usemacros 0
%endif
%endif
%if 0%{?rhel} && 0%{?rhel} <= 6 %if 0%{?rhel} && 0%{?rhel} <= 6
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
%global runjavareconf 0 %global runjavareconf 0
@ -120,7 +130,7 @@
Name: R Name: R
Version: 3.6.1 Version: 3.6.1
Release: 1%{?dist} Release: 2%{?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: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz
@ -295,6 +305,7 @@ Requires: openblas-Rblas
Requires: devtoolset-%{dts_version}-toolchain Requires: devtoolset-%{dts_version}-toolchain
%endif %endif
%if %{usemacros}
# These are the submodules that R-core provides. Sometimes R modules say they # These are the submodules that R-core provides. Sometimes R modules say they
# depend on one of these submodules rather than just R. These are provided for # depend on one of these submodules rather than just R. These are provided for
# packager convenience. # packager convenience.
@ -336,6 +347,36 @@ Obsoletes: R-Matrix < 0.999375-7
%add_submodule tools %{version} %add_submodule tools %{version}
%add_submodule translations %{version} %add_submodule translations %{version}
%add_submodule utils %{version} %add_submodule utils %{version}
%else
Provides: R-base = %{version}
Provides: R-boot = 1.3.22
Provides: R-class = 7.3.15
Provides: R-cluster = 2.1.0
Provides: R-codetools = 0.2.16
Provides: R-datasets = %{version}
Provides: R-foreign = 0.8.71
Provides: R-graphics = %{version}
Provides: R-grDevices = %{version}
Provides: R-grid = %{version}
Provides: R-KernSmooth = 2.23.15
Provides: R-lattice = 0.20.38
Provides: R-MASS = 7.3.51.4
Provides: R-Matrix = 1.2.17
Provides: R-methods = %{version}
Provides: R-mgcv = 1.8.28
Provides: R-nlme = 3.1.140
Provides: R-nnet = 7.3.12
Provides: R-parallel = %{version}
Provides: R-rpart = 4.1.15
Provides: R-spatial = 7.3.11
Provides: R-splines = %{version}
Provides: R-stats = %{version}
Provides: R-stats4 = %{version}
Provides: R-survival = 2.44.1.1
Provides: R-tcltk = %{version}
Provides: R-tools = %{version}
Provides: R-utils = %{version}
%endif
%description core %description core
A language and environment for statistical computing and graphics. A language and environment for statistical computing and graphics.
@ -405,7 +446,9 @@ Install R-core-devel if you are going to develop or compile R packages.
%package devel %package devel
Summary: Full R development environment metapackage Summary: Full R development environment metapackage
%if %{usemacros}
Requires: R-rpm-macros Requires: R-rpm-macros
%endif
Requires: R-core-devel = %{version}-%{release} Requires: R-core-devel = %{version}-%{release}
%if %{modern} %if %{modern}
Requires: R-java-devel = %{version}-%{release} Requires: R-java-devel = %{version}-%{release}
@ -1202,6 +1245,9 @@ R CMD javareconf \
%{_libdir}/libRmath.a %{_libdir}/libRmath.a
%changelog %changelog
* Fri Aug 30 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.1-2
- conditionalize macro usage so that it only happens on Fedora 31+ and EPEL-8
* Fri Aug 16 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.1-1 * Fri Aug 16 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.1-1
- update to 3.6.1 - update to 3.6.1