From b233690e3bdc1aa2e07e30c4466eca01cc6f5648 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Nov 28 2019 05:14:11 +0000 Subject: Update to latest version. --- diff --git a/.gitignore b/.gitignore index 3ec116f..96a2adc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /rmarkdown_1.15.tar.gz /rmarkdown_1.16.tar.gz /rmarkdown_1.17.tar.gz +/rmarkdown_1.18.tar.gz diff --git a/0001-Remove-unused-minified-ioslides-files.patch b/0001-Remove-unused-minified-ioslides-files.patch index 4c78efc..ce3bba5 100644 --- a/0001-Remove-unused-minified-ioslides-files.patch +++ b/0001-Remove-unused-minified-ioslides-files.patch @@ -1,4 +1,4 @@ -From 02d168c55b7e8b4d9730d1bce73f2c13c43c52dc Mon Sep 17 00:00:00 2001 +From b21c785aeea3cf56174bee6c6626121e61f5cab4 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 04:19:45 -0400 Subject: [PATCH 1/9] Remove unused minified ioslides files. diff --git a/0002-Unbundle-fonts-in-ioslides.patch b/0002-Unbundle-fonts-in-ioslides.patch index b1dfb91..12b9ffd 100644 --- a/0002-Unbundle-fonts-in-ioslides.patch +++ b/0002-Unbundle-fonts-in-ioslides.patch @@ -1,4 +1,4 @@ -From 3d4728a4cfdb0ebefdeade79ced566e5b1e7a565 Mon Sep 17 00:00:00 2001 +From 22b5e975774fbfc20c2cf5103d282d28fba52020 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 04:21:39 -0400 Subject: [PATCH 2/9] Unbundle fonts in ioslides. diff --git a/0004-Unbundle-jquery.patch b/0004-Unbundle-jquery.patch index 39316dc..8131572 100644 --- a/0004-Unbundle-jquery.patch +++ b/0004-Unbundle-jquery.patch @@ -1,4 +1,4 @@ -From 96f9fb6715ac3305c3b98204061f5d22a36d0816 Mon Sep 17 00:00:00 2001 +From 5e17552be82ca8b1baa8373bc468385fe6bc5324 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 04:49:59 -0400 Subject: [PATCH 4/9] Unbundle jquery. @@ -13,7 +13,7 @@ Signed-off-by: Elliott Sales de Andrade delete mode 100644 inst/rmd/h/jquery/jquery.min.js diff --git a/R/html_dependencies.R b/R/html_dependencies.R -index a3f070d2..00af79c3 100644 +index d8d4beaf..cf34e07d 100644 --- a/R/html_dependencies.R +++ b/R/html_dependencies.R @@ -19,8 +19,8 @@ html_dependency_jquery <- function() { @@ -21,7 +21,7 @@ index a3f070d2..00af79c3 100644 htmlDependency( name = "jquery", - version = "1.11.3", -- src = rmarkdown_system_file(file = "rmd/h/jquery"), +- src = pkg_file("rmd/h/jquery"), + version = "1.12.4", + src = "/usr/share/javascript/jquery/1.12.4/", script = "jquery.min.js") diff --git a/0005-Unbundle-highlight.js.patch b/0005-Unbundle-highlight.js.patch index 5e2ded1..2656482 100644 --- a/0005-Unbundle-highlight.js.patch +++ b/0005-Unbundle-highlight.js.patch @@ -1,4 +1,4 @@ -From 00a8a21f189bef703f74099b1905bd67535ef997 Mon Sep 17 00:00:00 2001 +From 59f5fc9f07aa0bd71a167dba2478d77399b24e52 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 05:10:52 -0400 Subject: [PATCH 5/9] Unbundle highlight.js. @@ -15,14 +15,14 @@ Signed-off-by: Elliott Sales de Andrade delete mode 100644 inst/rmd/h/highlightjs/textmate.css diff --git a/R/html_dependencies.R b/R/html_dependencies.R -index 00af79c3..0a1ec3e4 100644 +index cf34e07d..c1108a5d 100644 --- a/R/html_dependencies.R +++ b/R/html_dependencies.R @@ -289,9 +289,9 @@ html_dependency_highlightjs <- function(highlight) { htmlDependency( "highlightjs", version = "9.12.0", -- src = rmarkdown_system_file("rmd/h/highlightjs"), +- src = pkg_file("rmd/h/highlightjs"), - script = "highlight.js", - stylesheet = paste0(highlight, ".css") + src = "/usr/share/javascript/highlight.js", diff --git a/0006-Add-original-non-minified-Bootswatch-themes.patch b/0006-Add-original-non-minified-Bootswatch-themes.patch index 910688d..53a02ea 100644 --- a/0006-Add-original-non-minified-Bootswatch-themes.patch +++ b/0006-Add-original-non-minified-Bootswatch-themes.patch @@ -1,4 +1,4 @@ -From 025dc0884e4ec2179b10bc53c0db42393c85ea68 Mon Sep 17 00:00:00 2001 +From 6fa024b6ad446b624338157fdf1892bd8280496b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 06:02:19 -0400 Subject: [PATCH 6/9] Add original non-minified Bootswatch themes. diff --git a/0007-Unbundle-fonts-from-bootstrap.patch b/0007-Unbundle-fonts-from-bootstrap.patch index 9b9f138..5935893 100644 --- a/0007-Unbundle-fonts-from-bootstrap.patch +++ b/0007-Unbundle-fonts-from-bootstrap.patch @@ -1,4 +1,4 @@ -From 97729575eab6e5eb5de300d295b7dbedab7dab8a Mon Sep 17 00:00:00 2001 +From bc6a1c1b6d79ef4f0bf17a0c85b2a9c950e7460e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 05:46:03 -0400 Subject: [PATCH 7/9] Unbundle fonts from bootstrap. diff --git a/0008-Add-source-for-code-prettify.patch b/0008-Add-source-for-code-prettify.patch index 620439e..edcc7bc 100644 --- a/0008-Add-source-for-code-prettify.patch +++ b/0008-Add-source-for-code-prettify.patch @@ -1,4 +1,4 @@ -From be3c92dc52f8693f6c4a07c972ee075d5525a78c Mon Sep 17 00:00:00 2001 +From 403d7df243d6e2394c56bf928fc5835ba6045842 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 22 Apr 2018 04:54:16 -0400 Subject: [PATCH 8/9] Add source for code-prettify. diff --git a/0009-Skip-shiny-tests.patch b/0009-Skip-shiny-tests.patch index ef9c985..e0f57ee 100644 --- a/0009-Skip-shiny-tests.patch +++ b/0009-Skip-shiny-tests.patch @@ -1,4 +1,4 @@ -From dbbc3684b24210b82f171f24f583bd1a085ed6bb Mon Sep 17 00:00:00 2001 +From ede8c11544559e8e4023ceae45b9adb76e958df8 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 Apr 2018 06:25:19 -0400 Subject: [PATCH 9/9] Skip shiny tests. diff --git a/R-rmarkdown.spec b/R-rmarkdown.spec index 8c5c4f4..ac45734 100644 --- a/R-rmarkdown.spec +++ b/R-rmarkdown.spec @@ -5,7 +5,7 @@ %global with_suggests 0 Name: R-%{packname} -Version: 1.17 +Version: 1.18 Release: 1%{?dist} Summary: Dynamic Documents for R @@ -267,6 +267,9 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} %changelog +* Wed Nov 27 2019 Elliott Sales de Andrade - 1.18-1 +- Update to latest version + * Wed Nov 13 2019 Elliott Sales de Andrade - 1.17-1 - Update to latest version diff --git a/sources b/sources index 9bcafe5..d26ed86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rmarkdown_1.17.tar.gz) = e21a3998300c685dff21fc75ca0e370b93f912c46232b7846485ba174d8631b221dd15b830cbcf05b8f0b68a7f0c567cc13aa7bc73d64706131ec65e1f8bfe09 +SHA512 (rmarkdown_1.18.tar.gz) = 557c693bced8e57ca5feea7e48481027642a804a2cc71e0d429a9c2f5af6f8cb26704a17ed9eda4063a1a3068317b1c7c50b8af9b094e4a0dfd5997cfc2e8238