From 0f3830eb34e87723b098987efd50bbf9c001508f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Matos?= Date: Fri, 3 Jul 2020 16:48:16 +0100 Subject: [PATCH] replace "with_suggests" by "bcond_with bootstrap" since that is really its purpose --- R-glue.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/R-glue.spec b/R-glue.spec index 3221afb..574cb08 100644 --- a/R-glue.spec +++ b/R-glue.spec @@ -2,12 +2,12 @@ %global packver 1.4.1 %global rlibdir %{_libdir}/R/library -# Not all available yet. -%global with_suggests 0 +# When we are bootstrapping, we drop some dependencies, and/or build time tests. +%bcond_with bootstrap Name: R-%{packname} Version: %{packver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Interpreted String Literals License: MIT @@ -24,7 +24,7 @@ Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}. BuildRequires: R-devel BuildRequires: tex(latex) BuildRequires: R-methods -%if %{with_suggests} +%if %{without bootstrap} BuildRequires: R-testthat BuildRequires: R-magrittr BuildRequires: R-crayon @@ -70,7 +70,7 @@ rm -f %{buildroot}%{rlibdir}/R.css %check export LANG=C.UTF-8 -%if %{with_suggests} +%if %{without bootstrap} %{_bindir}/R CMD check %{packname} %endif @@ -92,6 +92,9 @@ export LANG=C.UTF-8 %changelog +* Fri Jul 3 2020 José Matos - 1.4.1-2 +- replace "with_suggests" by "bcond_with bootstrap" since that is really its purpose + * Wed Jun 3 2020 Tom Callaway - 1.4.1-1 - break testthat loop by broadening "with_suggests" - update to 1.4.1