From aeaea45b6f3b0f9866861f48e12e980c245c238a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 3 Jun 2020 15:26:06 -0400 Subject: [PATCH] conditionalize check to break testthat loop, rebuild for R 4.0.0 --- R-rprojroot.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/R-rprojroot.spec b/R-rprojroot.spec index c8e05b5..fa56af7 100644 --- a/R-rprojroot.spec +++ b/R-rprojroot.spec @@ -1,3 +1,5 @@ +%bcond_with check + %global packname rprojroot %global rlibdir %{_datadir}/R/library %global packver 1.3-2 @@ -7,7 +9,7 @@ Name: R-%{packname} Version: 1.3.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Finding Files in Project Subdirectories License: GPLv3 @@ -25,6 +27,7 @@ BuildArch: noarch BuildRequires: R-devel BuildRequires: tex(latex) BuildRequires: R-backports +%if %{with check} BuildRequires: R-testthat BuildRequires: R-mockr %if %{with_doc} @@ -32,6 +35,7 @@ BuildRequires: R-knitr BuildRequires: R-withr BuildRequires: R-rmarkdown %endif +%endif %description Robust, reliable and flexible paths to files below a project root. The @@ -54,12 +58,14 @@ rm -f %{buildroot}%{rlibdir}/R.css %check +%if %{with check} export NOT_CRAN=true %if %{with_doc} %{_bindir}/R CMD check %{packname} %else _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes %endif +%endif %files @@ -76,6 +82,10 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} --ignore-vignettes %changelog +* Wed Jun 3 2020 Tom Callaway - 1.3.2-8 +- conditionalize check to break testthat loop +- rebuild for R 4 + * Tue Jan 28 2020 Fedora Release Engineering - 1.3.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild