From a05ed78dd7277934f4e5a4ba976c55a325045b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Wed, 1 Nov 2023 14:57:03 +0100
Subject: [PATCH] Update to 3.2.0

---
 .gitignore      |  1 +
 R-testthat.spec | 67 +++++++++++++++++++++++--------------------------
 sources         |  2 +-
 3 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 069855a..abf223a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /testthat_3.1.4.tar.gz
 /testthat_3.1.6.tar.gz
 /testthat_3.1.7.tar.gz
+/testthat_3.2.0.tar.gz
diff --git a/R-testthat.spec b/R-testthat.spec
index a5b1460..868dfc2 100644
--- a/R-testthat.spec
+++ b/R-testthat.spec
@@ -1,52 +1,51 @@
 %bcond_with check
 
 %global packname testthat
-%global packver 3.1.7
-
-%global __suggests_exclude ^R\\((devtools)\\)
+%global packver 3.2.0
 
 Name:             R-%{packname}
 Version:          %{packver}
 Release:          %autorelease
-Source0:          ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{packver}.tar.gz
-License:          MIT
-URL:              https://cran.r-project.org/package=testthat
 Summary:          Unit Testing for R
-BuildRequires:    R-devel >= 3.4.0, tetex-latex
-BuildRequires:    R-brio
-BuildRequires:    R-callr >= 3.5.1
-BuildRequires:    R-cli >= 3.4.0
-BuildRequires:    R-desc
-BuildRequires:    R-digest
-BuildRequires:    R-ellipsis >= 0.2.0
-BuildRequires:    R-evaluate
-BuildRequires:    R-jsonlite
-BuildRequires:    R-lifecycle
-BuildRequires:    R-magrittr
+
+License:          MIT
+URL:              https://cran.r-project.org/package=%{packname}
+Source0:          %{url}&version=%{packver}#/%{packname}_%{packver}.tar.gz
+
+BuildRequires:    R-devel >= 3.6.0, tetex-latex
+BuildRequires:    R-brio >= 1.1.3
+BuildRequires:    R-callr >= 3.7.3
+BuildRequires:    R-cli >= 3.6.1
+BuildRequires:    R-desc >= 1.4.2
+BuildRequires:    R-digest >= 0.6.33
+BuildRequires:    R-ellipsis >= 0.3.2
+BuildRequires:    R-evaluate >= 0.21
+BuildRequires:    R-jsonlite >= 1.8.7
+BuildRequires:    R-lifecycle >= 1.0.3
+BuildRequires:    R-magrittr >= 2.0.3
 BuildRequires:    R-methods
-BuildRequires:    R-pkgload
-BuildRequires:    R-praise
-BuildRequires:    R-processx
-BuildRequires:    R-ps >= 1.3.4
-BuildRequires:    R-R6 >= 2.2.0
-BuildRequires:    R-rlang >= 1.0.1
+BuildRequires:    R-pkgload >= 1.3.2.1
+BuildRequires:    R-praise >= 1.0.0
+BuildRequires:    R-processx >= 3.8.2
+BuildRequires:    R-ps >= 1.7.5
+BuildRequires:    R-R6 >= 2.5.1
+BuildRequires:    R-rlang >= 1.1.1
 BuildRequires:    R-utils
-BuildRequires:    R-waldo >= 0.4.0
-BuildRequires:    R-withr >= 2.4.3
-%if %{with check}
-BuildRequires:    R-covr
+BuildRequires:    R-waldo >= 0.5.1
+BuildRequires:    R-withr >= 2.5.0
+
 BuildRequires:    R-curl >= 0.9.5
-# Not in Fedora as of 2020-11-02
-BuildRequires:    R-diffviewer >= 0.1.0
+# for skip_if_offline()
+Requires:         R-curl
 BuildRequires:    R-knitr
-BuildRequires:    R-mockery
 BuildRequires:    R-rmarkdown
 BuildRequires:    R-rstudioapi
 BuildRequires:    R-shiny
 BuildRequires:    R-usethis
 BuildRequires:    R-vctrs >= 0.1.0
 BuildRequires:    R-xml2
-%endif
+# Not in Fedora as of 2023-11-01
+# BuildRequires:    R-diffviewer >= 0.1.0
 
 %description
 A unit testing system designed to be fun, flexible, and easy to set up.
@@ -54,7 +53,7 @@ A unit testing system designed to be fun, flexible, and easy to set up.
 %prep
 %setup -q -c -n %{packname}
 
-# Don't need coverage; it's not packaged either.
+# Don't need coverage
 sed -i 's/covr, //g' %{packname}/DESCRIPTION
 
 %build
@@ -66,10 +65,8 @@ test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
 
 %check
-%if %{with check}
 export _R_CHECK_FORCE_SUGGESTS_=0 LANG=C.UTF-8
-%{_bindir}/R CMD check --ignore-vignettes %{packname}
-%endif
+%{_bindir}/R CMD check --ignore-vignettes --no-manual %{packname}
 
 %files
 %dir %{_libdir}/R/library/%{packname}
diff --git a/sources b/sources
index f208f93..55d1b84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testthat_3.1.7.tar.gz) = 375af8052487d28fe5a5aeebd601174786f77ab6fe14e06eaed31f15d7220cfec779dee1f7c4b80b81749e3362f35e32ef71e3717ba7348204131f375823bfcf
+SHA512 (testthat_3.2.0.tar.gz) = 443f2135d042cf7b7b9f6acbf8750cddfad5f026f778053d99aa39df6e2ea32ce5aa35ea033fdb7cfd6613cb44142c6c4c490e1c949bd56276065fbd1a5427b0