Skip to content

Commit

Permalink
R-rmarkdown: Autospec creation for update from version 2.10 to versio…
Browse files Browse the repository at this point in the history
…n 2.11

Christophe Dervieux (2):
      Mark result of citeproc conversion as UTF-8 (#2202)
      Bump version

Garrick Aden-Buie (1):
      Prerender shiny rmd in separate environment (#2203)

Yihui Xie (9):
      start the next version
      close #1814: upgrade jquery by using the R package jquerylib, which currently ships jquery 3.x by default (#2197)
      pin the jquery version to 3: rstudio/rmarkdown#2197 (comment)
      fix yihui/xaringan#331: respect relative paths in parent directories in the `css` argument of `html_document()`
      use sass::output_template() instead of storing a copy in rmarkdown
      export convert_ipynb() per suggestion of @acircleda
      roxygenize and bump version
      https://rmarkdown.rstudio.com/authoring_bibliographies_and_citations.html -> https://pandoc.org/MANUAL.html#citations
      CRAN release v2.11

christophe dervieux (1):
      Add a specific dirname for sass caching
  • Loading branch information
fenrus75 committed Sep 15, 2021
1 parent 9c025ac commit 06eda19
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME := R-rmarkdown
URL = https://cran.r-project.org/src/contrib/rmarkdown_2.10.tar.gz
URL = https://cran.r-project.org/src/contrib/rmarkdown_2.11.tar.gz
ARCHIVES =

include ../common/Makefile.common
19 changes: 11 additions & 8 deletions R-rmarkdown.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
# Generated by: autospec.py
#
Name : R-rmarkdown
Version : 2.10
Release : 60
URL : https://cran.r-project.org/src/contrib/rmarkdown_2.10.tar.gz
Source0 : https://cran.r-project.org/src/contrib/rmarkdown_2.10.tar.gz
Version : 2.11
Release : 61
URL : https://cran.r-project.org/src/contrib/rmarkdown_2.11.tar.gz
Source0 : https://cran.r-project.org/src/contrib/rmarkdown_2.11.tar.gz
Summary : Dynamic Documents for R
Group : Development/Tools
License : GPL-3.0 MIT
Requires: R-evaluate
Requires: R-htmltools
Requires: R-jquerylib
Requires: R-jsonlite
Requires: R-knitr
Requires: R-stringr
Expand All @@ -20,6 +21,7 @@ Requires: R-xfun
Requires: R-yaml
BuildRequires : R-evaluate
BuildRequires : R-htmltools
BuildRequires : R-jquerylib
BuildRequires : R-jsonlite
BuildRequires : R-knitr
BuildRequires : R-stringr
Expand All @@ -41,10 +43,10 @@ export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1628259360
export SOURCE_DATE_EPOCH=1631666733

%install
export SOURCE_DATE_EPOCH=1628259360
export SOURCE_DATE_EPOCH=1631666733
rm -rf %{buildroot}
export LANG=C.UTF-8
export CFLAGS="$CFLAGS -O3 -flto -fno-semantic-interposition "
Expand Down Expand Up @@ -211,8 +213,6 @@ R CMD check --no-manual --no-examples --no-codoc rmarkdown || :
/usr/lib64/R/library/rmarkdown/rmd/h/ionicons/css/ionicons.css
/usr/lib64/R/library/rmarkdown/rmd/h/ionicons/css/ionicons.min.css
/usr/lib64/R/library/rmarkdown/rmd/h/ionicons/fonts/ionicons.ttf
/usr/lib64/R/library/rmarkdown/rmd/h/jquery-AUTHORS.txt
/usr/lib64/R/library/rmarkdown/rmd/h/jquery/jquery.min.js
/usr/lib64/R/library/rmarkdown/rmd/h/jqueryui-AUTHORS.txt
/usr/lib64/R/library/rmarkdown/rmd/h/jqueryui/README
/usr/lib64/R/library/rmarkdown/rmd/h/jqueryui/images/ui-icons_444444_256x240.png
Expand Down Expand Up @@ -348,9 +348,11 @@ R CMD check --no-manual --no-examples --no-codoc rmarkdown || :
/usr/lib64/R/library/rmarkdown/tests/testthat/_snaps/md_document/yaml-block-markdown_phpextra.md
/usr/lib64/R/library/rmarkdown/tests/testthat/_snaps/md_document/yaml-block-markdown_strict-meta.md
/usr/lib64/R/library/rmarkdown/tests/testthat/_snaps/md_document/yaml-block-markdown_strict.md
/usr/lib64/R/library/rmarkdown/tests/testthat/_snaps/pandoc.md
/usr/lib64/R/library/rmarkdown/tests/testthat/_snaps/render/A.split.md
/usr/lib64/R/library/rmarkdown/tests/testthat/_snaps/render/B.split.md
/usr/lib64/R/library/rmarkdown/tests/testthat/helpers.R
/usr/lib64/R/library/rmarkdown/tests/testthat/resources/UTF8.bib
/usr/lib64/R/library/rmarkdown/tests/testthat/resources/csvs/csv1.csv
/usr/lib64/R/library/rmarkdown/tests/testthat/resources/csvs/csv2.csv
/usr/lib64/R/library/rmarkdown/tests/testthat/resources/csvs/other/csv3.csv
Expand Down Expand Up @@ -409,6 +411,7 @@ R CMD check --no-manual --no-examples --no-codoc rmarkdown || :
/usr/lib64/R/library/rmarkdown/tests/testthat/test-md_document.R
/usr/lib64/R/library/rmarkdown/tests/testthat/test-notebook.R
/usr/lib64/R/library/rmarkdown/tests/testthat/test-output_format.R
/usr/lib64/R/library/rmarkdown/tests/testthat/test-pandoc.R
/usr/lib64/R/library/rmarkdown/tests/testthat/test-params.R
/usr/lib64/R/library/rmarkdown/tests/testthat/test-render.R
/usr/lib64/R/library/rmarkdown/tests/testthat/test-resources.R
Expand Down
2 changes: 1 addition & 1 deletion options.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = R-rmarkdown
url = https://cran.r-project.org/src/contrib/rmarkdown_2.10.tar.gz
url = https://cran.r-project.org/src/contrib/rmarkdown_2.11.tar.gz
archives =
giturl = https://github.com/rstudio/rmarkdown.git
domain =
Expand Down
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
60
61
2 changes: 1 addition & 1 deletion upstream
Original file line number Diff line number Diff line change
@@ -1 +1 @@
298c69b011aca0370569a1e2f54ef07bda0111c7/rmarkdown_2.10.tar.gz
b392eeeec7504a589b26e794c1e4ff7e2491adb1/rmarkdown_2.11.tar.gz
2 changes: 1 addition & 1 deletion versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.10
2.11

0 comments on commit 06eda19

Please sign in to comment.