Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2019-02-21 03:16:53 -05:00
parent 93e496823b
commit 68774c5ae3
3 changed files with 32 additions and 19 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/knitr_1.17.tar.gz
/knitr_1.18.tar.gz
/knitr_1.20.tar.gz
/knitr_1.21.tar.gz

View File

@ -1,12 +1,13 @@
%global packname knitr
%global rlibdir %{_datadir}/R/library
%global with_loop 1
# Mostly unnecessary for a simple build, plus a lot depend on knitr.
%global with_suggests 0
Name: R-%{packname}
Version: 1.20
Release: 3%{?dist}
Version: 1.21
Release: 1%{?dist}
Summary: A General-Purpose Package for Dynamic Report Generation in R
License: GPLv2+
@ -15,8 +16,8 @@ Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.
# Here's the R view of the dependencies world:
# Depends:
# Imports: R-evaluate >= 0.10, R-highr, R-markdown, R-stringr >= 0.6, R-yaml, R-methods, R-tools
# Suggests: R-formatR, R-testit, R-digest, R-rgl >= 0.95.1201, R-codetools, R-rmarkdown, R-htmlwidgets >= 0.7, R-webshot, R-tikzDevice >= 0.10, R-tinytex, R-xfun, R-reticulate >= 1.4, R-JuliaCall >= 0.11.1, R-png, R-jpeg, R-xml2, R-httr, R-DBI >= 0.4-1, R-showtext, R-tibble
# Imports: R-evaluate >= 0.10, R-highr, R-markdown, R-stringr >= 0.6, R-yaml >= 2.1.19, R-methods, R-xfun, R-tools
# Suggests: R-formatR, R-testit, R-digest, R-rgl >= 0.95.1201, R-codetools, R-rmarkdown, R-htmlwidgets >= 0.7, R-webshot, R-tikzDevice >= 0.10, R-tinytex, R-reticulate >= 1.4, R-JuliaCall >= 0.11.1, R-png, R-jpeg, R-gifski, R-xml2 >= 1.2.0, R-httr, R-DBI >= 0.4-1, R-showtext, R-tibble, R-styler
# LinkingTo:
# Enhances:
@ -28,8 +29,9 @@ Requires: R-evaluate >= 0.10
Requires: R-highr
Requires: R-markdown
Requires: R-stringr >= 0.6
Requires: R-yaml
Requires: R-yaml >= 2.1.19
Requires: R-methods
Requires: R-xfun
Requires: R-tools
Suggests: R-formatR
Suggests: R-digest
@ -40,16 +42,17 @@ Suggests: R-htmlwidgets >= 0.7
Suggests: R-webshot
Suggests: R-tikzDevice >= 0.10
Suggests: R-tinytex
Suggests: R-xfun
Suggests: R-reticulate >= 1.4
Suggests: R-JuliaCall >= 0.11.1
Suggests: R-png
Suggests: R-jpeg
Suggests: R-xml2
Suggests: R-gifski
Suggests: R-xml2 >= 1.2.0
Suggests: R-httr
Suggests: R-DBI >= 0.4.1
Suggests: R-showtext
Suggests: R-tibble
Suggests: R-styler
BuildRequires: R-devel
BuildRequires: tex(latex)
BuildRequires: tex(framed.sty)
@ -57,8 +60,9 @@ BuildRequires: R-evaluate >= 0.10
BuildRequires: R-highr
BuildRequires: R-markdown
BuildRequires: R-stringr >= 0.6
BuildRequires: R-yaml
BuildRequires: R-yaml >= 2.1.19
BuildRequires: R-methods
BuildRequires: R-xfun
BuildRequires: R-tools
BuildRequires: R-testit
BuildRequires: R-digest
@ -66,22 +70,24 @@ BuildRequires: R-codetools
BuildRequires: R-htmlwidgets >= 0.7
BuildRequires: R-tikzDevice >= 0.10
BuildRequires: R-tinytex
BuildRequires: R-xfun
BuildRequires: R-png
BuildRequires: R-jpeg
BuildRequires: R-xml2
BuildRequires: R-xml2 >= 1.2.0
BuildRequires: R-DBI >= 0.4.1
BuildRequires: R-showtext
%if %{with_suggests}
%if %{with_loop}
BuildRequires: R-formatR
BuildRequires: R-rgl >= 0.95.1201
BuildRequires: R-rmarkdown
%endif
%if %{with_suggests}
BuildRequires: R-rgl >= 0.95.1201
BuildRequires: R-webshot
BuildRequires: R-reticulate >= 1.4
BuildRequires: R-JuliaCall >= 0.11.1
BuildRequires: R-httr
BuildRequires: R-gifski
BuildRequires: R-httr
BuildRequires: R-tibble
BuildRequires: R-styler
# Mostly examples.
BuildRequires; R-Cairo
BuildRequires: lyx
@ -122,11 +128,14 @@ rm %{buildroot}%{rlibdir}/%{packname}/misc/framed.sty
%check
%if %{with_suggests}
%{_bindir}/R CMD check %{packname}
%else
_R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname}
%if ! %{with_suggests} || ! %{with_loop}
export _R_CHECK_FORCE_SUGGESTS_=0
%endif
%if ! %{with_loop}
ARGS=--no-examples
%endif
%{_bindir}/R CMD check %{packname} $ARGS
%files
@ -135,7 +144,7 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname}
%doc %{rlibdir}/%{packname}/doc
%doc %{rlibdir}/%{packname}/html
%{rlibdir}/%{packname}/DESCRIPTION
%{rlibdir}/%{packname}/NEWS.Rd
%{rlibdir}/%{packname}/NEWS.md
%{rlibdir}/%{packname}/INDEX
%{rlibdir}/%{packname}/NAMESPACE
%{rlibdir}/%{packname}/Meta
@ -151,6 +160,9 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname}
%changelog
* Thu Feb 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.21-1
- Update to latest version
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (knitr_1.20.tar.gz) = 5d8b8c2c4e0c74104faaa42dd6a499937fd55f5af3da8fdf396b656f0bc3df9e847dff52e10c41f0039a240e3b064b1912ea01ebe4580ea35465d920330ee220
SHA512 (knitr_1.21.tar.gz) = c0eb6b30bd8089315ea38f0417d45eaa5efbc2ff84e9170481a5806e9c49bf7b9b54c30cec762accaf7328657823f8a8cfdb2d939506e794bcae17b861a1a1ce