From edbed2016a3c1d6e75623128a7dbcc49edd64b49 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 7 Jun 2021 16:50:29 -0400 Subject: [PATCH] update to 1.11, disable check via conditional, rebuild for R 4.1.0 --- .gitignore | 1 + R-formatR.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 307b3d8..fe1befb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /formatR_1.7.tar.gz /formatR_1.8.tar.gz /formatR_1.9.tar.gz +/formatR_1.11.tar.gz diff --git a/R-formatR.spec b/R-formatR.spec index 2301a74..efbd09e 100644 --- a/R-formatR.spec +++ b/R-formatR.spec @@ -1,9 +1,11 @@ +%bcond_with check + %global packname formatR -%global packver 1.9 +%global packver 1.11 %global rlibdir %{_datadir}/R/library Name: R-%{packname} -Version: 1.9 +Version: 1.11 Release: 1%{?dist} Summary: Format R Code Automatically @@ -21,11 +23,13 @@ Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}. BuildArch: noarch BuildRequires: R-devel BuildRequires: tex(latex) +%if %{with check} BuildRequires: R-codetools BuildRequires: R-shiny BuildRequires: R-testit BuildRequires: R-rmarkdown BuildRequires: R-knitr +%endif %description Provides a function tidy_source() to format R source code. Spaces and indent @@ -49,7 +53,9 @@ rm -f %{buildroot}%{rlibdir}/R.css %check +%if %{with check} %{_bindir}/R CMD check %{packname} +%endif %files @@ -68,6 +74,11 @@ rm -f %{buildroot}%{rlibdir}/R.css %changelog +* Mon Jun 7 2021 Tom Callaway - 1.11-1 +- update to 1.11 +- conditionalize check and BR, disable check +- Rebuilt for R 4.1.0 + * Sat Apr 17 2021 Elliott Sales de Andrade - 1.9-1 - Update to latest version (#1949655) diff --git a/sources b/sources index 00b91e5..7f2f417 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (formatR_1.9.tar.gz) = 2308687aefe30cdb03f1b25b8cf6cb9b46408a15736112f38200156514e634eca2226b7c5b6c2bd72a12c55616de175bb1b4c01c2de22829e8d49cab67c44f33 +SHA512 (formatR_1.11.tar.gz) = 448eb939300e060b5cf4ae5b2c3b5067469600d7a888de8725bf68fa3ec503419bfa5e2a969e42b295ed823408e9752597478432468758fc98af12ae1943937f