rebuild for R 4.1.0, bootstrap

This commit is contained in:
Tom spot Callaway 2021-06-11 12:16:27 -04:00
parent 6d106559bf
commit 62b0a89661

View File

@ -1,3 +1,5 @@
%bcond_without bootstrap
%global packname hunspell %global packname hunspell
%global packver 3.0.1 %global packver 3.0.1
%global rlibdir %{_libdir}/R/library %global rlibdir %{_libdir}/R/library
@ -11,7 +13,7 @@
Name: R-%{packname} Name: R-%{packname}
Version: 3.0.1 Version: 3.0.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: High-Performance Stemmer, Tokenizer, and Spell Checker Summary: High-Performance Stemmer, Tokenizer, and Spell Checker
License: GPLv2 or LGPLv2 or MPLv1.1 License: GPLv2 or LGPLv2 or MPLv1.1
@ -29,6 +31,7 @@ BuildRequires: R-devel
BuildRequires: tex(latex) BuildRequires: tex(latex)
BuildRequires: R-Rcpp-devel BuildRequires: R-Rcpp-devel
BuildRequires: R-digest BuildRequires: R-digest
%if %{without bootstrap}
BuildRequires: R-knitr BuildRequires: R-knitr
BuildRequires: R-rmarkdown BuildRequires: R-rmarkdown
BuildRequires: R-testthat BuildRequires: R-testthat
@ -39,6 +42,7 @@ BuildRequires: R-janeaustenr
BuildRequires: R-wordcloud2 BuildRequires: R-wordcloud2
BuildRequires: R-stopwords BuildRequires: R-stopwords
%endif %endif
%endif
# Not currently possible to unbundle at the moment. # Not currently possible to unbundle at the moment.
# https://github.com/ropensci/hunspell/issues/34 # https://github.com/ropensci/hunspell/issues/34
@ -71,6 +75,7 @@ rm -f %{buildroot}%{rlibdir}/R.css
%check %check
%if %{without bootstrap}
# Can't run spell check with dependency loop. # Can't run spell check with dependency loop.
%if !%{with_suggests} %if !%{with_suggests}
rm %{packname}/tests/spelling.R rm %{packname}/tests/spelling.R
@ -86,6 +91,7 @@ ARGS="--no-examples --no-vignettes"
%else %else
_R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} $ARGS _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} $ARGS
%endif %endif
%endif
%files %files
@ -107,6 +113,10 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} $ARGS
%changelog %changelog
* Fri Jun 11 2021 Tom Callaway <spot@fedoraproject.org> - 3.0.1-3
- Rebuilt for R 4.1.0
- bootstrap
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild