From 8f43cad8627890aae5303b9f26d4ddcbefc35012 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 3 Jun 2020 16:16:25 -0400 Subject: [PATCH] conditionalize check to break testthat loop, rebuild for R 4 --- R-desc.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/R-desc.spec b/R-desc.spec index aa9bd01..34a2b0c 100644 --- a/R-desc.spec +++ b/R-desc.spec @@ -1,9 +1,11 @@ +%bcond_with check + %global packname desc %global rlibdir %{_datadir}/R/library Name: R-%{packname} Version: 1.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Manipulate DESCRIPTION Files License: MIT @@ -25,9 +27,11 @@ BuildRequires: R-utils BuildRequires: R-R6 BuildRequires: R-crayon BuildRequires: R-rprojroot +%if %{with check} BuildRequires: R-testthat BuildRequires: R-whoami BuildRequires: R-withr +%endif %description Tools to read, write, create, and manipulate DESCRIPTION files. It is @@ -55,8 +59,10 @@ rm %{buildroot}%{rlibdir}/%{packname}/README.md %check +%if %{with check} export LANG=C.UTF-8 %{_bindir}/R CMD check %{packname} +%endif %files @@ -75,6 +81,10 @@ export LANG=C.UTF-8 %changelog +* Wed Jun 3 2020 Tom Callaway - 1.2.0-7 +- conditionalize check to break testthat loop +- rebuild for R 4 + * Tue Jan 28 2020 Fedora Release Engineering - 1.2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild