Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2018-06-22 19:25:20 -04:00
parent ed6bb34922
commit 4733758b8d
7 changed files with 223 additions and 79 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/rmarkdown_1.9.tar.gz
/rmarkdown_1.10.tar.gz

View File

@ -1,3 +1,33 @@
From 4a03bd71af4d5b4f5ec5f5ef02d7b50bd16acb56 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 21 Apr 2018 04:21:39 -0400
Subject: [PATCH 2/9] Unbundle fonts in ioslides.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
.../ioslides-13.5.1/fonts/OpenSans-Italic.ttf | 1 +
.../ioslides-13.5.1/fonts/OpenSans-Regular.ttf | 1 +
.../ioslides-13.5.1/fonts/OpenSans-Semibold.ttf | 1 +
.../fonts/OpenSans-SemiboldItalic.ttf | 1 +
.../ioslides/ioslides-13.5.1/fonts/OpenSans.ttf | Bin 36492 -> 0 bytes
.../ioslides-13.5.1/fonts/OpenSansItalic.ttf | Bin 34416 -> 0 bytes
.../ioslides-13.5.1/fonts/OpenSansSemibold.ttf | Bin 37568 -> 0 bytes
.../fonts/OpenSansSemiboldItalic.ttf | Bin 34652 -> 0 bytes
.../fonts/SourceCodePro-Regular.otf | 1 +
.../ioslides-13.5.1/fonts/SourceCodePro.ttf | Bin 42380 -> 0 bytes
.../ioslides/ioslides-13.5.1/fonts/fonts.css | 8 ++++----
11 files changed, 9 insertions(+), 4 deletions(-)
create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans-Italic.ttf
create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans-Regular.ttf
create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans-Semibold.ttf
create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans-SemiboldItalic.ttf
delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSans.ttf
delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSansItalic.ttf
delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSansSemibold.ttf
delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/OpenSansSemiboldItalic.ttf
create mode 120000 inst/rmd/ioslides/ioslides-13.5.1/fonts/SourceCodePro-Regular.otf
delete mode 100644 inst/rmd/ioslides/ioslides-13.5.1/fonts/SourceCodePro.ttf
diff --git a/inst/rmd/ioslides/ioslides-13.5.1/fonts/fonts.css b/inst/rmd/ioslides/ioslides-13.5.1/fonts/fonts.css
index a949d32c..1315838e 100644
--- a/inst/rmd/ioslides/ioslides-13.5.1/fonts/fonts.css
@ -30,8 +60,25 @@ index a949d32c..1315838e 100644
- src: url(SourceCodePro.ttf) format('truetype');
+ src: url(SourceCodePro-Regular.otf) format('opentype');
}
--
2.17.1
From ae77b6224fadc16de118567a637cd8818d0173a5 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 21 Apr 2018 04:49:59 -0400
Subject: [PATCH 4/9] Unbundle jquery.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
R/html_dependencies.R | 4 +-
inst/rmd/h/jquery-1.11.3/jquery.min.js | 5 -
inst/rmd/h/jquery-AUTHORS.txt | 217 -------------------------
3 files changed, 2 insertions(+), 224 deletions(-)
delete mode 100644 inst/rmd/h/jquery-1.11.3/jquery.min.js
delete mode 100644 inst/rmd/h/jquery-AUTHORS.txt
diff --git a/R/html_dependencies.R b/R/html_dependencies.R
index 47fc8ca3..a6408aaf 100644
index 34da0bc6..8d998ac3 100644
--- a/R/html_dependencies.R
+++ b/R/html_dependencies.R
@@ -15,8 +15,8 @@ NULL
@ -45,18 +92,30 @@ index 47fc8ca3..a6408aaf 100644
script = "jquery.min.js")
}
@@ -82,8 +82,8 @@ html_dependency_navigation <- function(code_menu, source_embed) {
html_dependency_font_awesome <- function() {
htmlDependency(
"font-awesome",
- "4.5.0",
- src = rmarkdown_system_file("rmd/h/font-awesome-4.5.0"),
+ "4.7.0",
+ src = rmarkdown_system_file("rmd/h/font-awesome-4.7.0"),
stylesheet = "css/font-awesome.min.css"
)
}
@@ -280,9 +280,9 @@ html_dependency_highlightjs <- function(highlight) {
--
2.17.1
From 73990b5053f0bf5ff7005e736456eceed8d1986c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 21 Apr 2018 05:10:52 -0400
Subject: [PATCH 5/9] Unbundle highlight.js.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
R/html_dependencies.R | 6 +++---
inst/rmd/h/highlightjs/default.css | 21 ---------------------
inst/rmd/h/highlightjs/highlight.js | 2 --
inst/rmd/h/highlightjs/textmate.css | 19 -------------------
4 files changed, 3 insertions(+), 45 deletions(-)
delete mode 100644 inst/rmd/h/highlightjs/default.css
delete mode 100644 inst/rmd/h/highlightjs/highlight.js
delete mode 100644 inst/rmd/h/highlightjs/textmate.css
diff --git a/R/html_dependencies.R b/R/html_dependencies.R
index 8d998ac3..fc4fcb31 100644
--- a/R/html_dependencies.R
+++ b/R/html_dependencies.R
@@ -283,9 +283,9 @@ html_dependency_highlightjs <- function(highlight) {
htmlDependency(
"highlightjs",
version = "9.12.0",
@ -69,6 +128,81 @@ index 47fc8ca3..a6408aaf 100644
)
}
--
2.17.1
From 9a9f83bb9ed5ad676ecb5093f85f5e67553e2e6d Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 21 Apr 2018 05:46:03 -0400
Subject: [PATCH 6/9] Unbundle fonts from bootstrap.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css | 6 +-
inst/rmd/h/bootstrap-3.3.5/css/fonts/Lato.ttf | Bin 81980 -> 38 bytes
.../h/bootstrap-3.3.5/css/fonts/LatoBold.ttf | Bin 82368 -> 35 bytes
.../bootstrap-3.3.5/css/fonts/LatoItalic.ttf | Bin 81332 -> 37 bytes
.../h/bootstrap-3.3.5/css/fonts/OpenSans.ttf | Bin 34112 -> 47 bytes
.../css/fonts/OpenSansBold.ttf | Bin 35760 -> 44 bytes
.../css/fonts/OpenSansBoldItalic.ttf | Bin 33064 -> 50 bytes
.../css/fonts/OpenSansItalic.ttf | Bin 32808 -> 46 bytes
.../css/fonts/OpenSansLight.ttf | Bin 35340 -> 45 bytes
.../css/fonts/OpenSansLightItalic.ttf | Bin 32680 -> 51 bytes
.../css/fonts/Raleway-Bold.otf | 1 +
.../css/fonts/Raleway-Regular.otf | 1 +
.../h/bootstrap-3.3.5/css/fonts/Raleway.ttf | Bin 63796 -> 0 bytes
.../bootstrap-3.3.5/css/fonts/RalewayBold.ttf | Bin 62224 -> 0 bytes
.../h/bootstrap-3.3.5/css/fonts/Roboto.ttf | Bin 32652 -> 49 bytes
.../bootstrap-3.3.5/css/fonts/RobotoBold.ttf | Bin 32500 -> 46 bytes
.../bootstrap-3.3.5/css/fonts/RobotoLight.ttf | Bin 32664 -> 47 bytes
.../css/fonts/RobotoMedium.ttf | Bin 32580 -> 48 bytes
.../css/fonts/SourceSansPro-Bold.otf | 1 +
.../css/fonts/SourceSansPro-It.otf | 1 +
.../css/fonts/SourceSansPro-Light.otf | 1 +
.../css/fonts/SourceSansPro-Regular.otf | 1 +
.../css/fonts/SourceSansPro.ttf | Bin 35064 -> 0 bytes
.../css/fonts/SourceSansProBold.ttf | Bin 34908 -> 0 bytes
.../css/fonts/SourceSansProItalic.ttf | Bin 33864 -> 0 bytes
.../css/fonts/SourceSansProLight.ttf | Bin 35368 -> 0 bytes
inst/rmd/h/bootstrap-3.3.5/css/lumen.min.css | 8 +-
.../h/bootstrap-3.3.5/css/readable.min.css | 4 +-
.../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes
.../fonts/glyphicons-halflings-regular.svg | 288 ------------------
.../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 70 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes
33 files changed, 15 insertions(+), 297 deletions(-)
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/Lato.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/LatoBold.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/LatoItalic.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSans.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansBold.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansBoldItalic.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansItalic.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansLight.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/OpenSansLightItalic.ttf
create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/Raleway-Bold.otf
create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/Raleway-Regular.otf
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/Raleway.ttf
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/RalewayBold.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/Roboto.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/RobotoBold.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/RobotoLight.ttf
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/RobotoMedium.ttf
create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro-Bold.otf
create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro-It.otf
create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro-Light.otf
create mode 120000 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro-Regular.otf
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansPro.ttf
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansProBold.ttf
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansProItalic.ttf
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/css/fonts/SourceSansProLight.ttf
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.eot
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.svg
mode change 100644 => 120000 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.ttf
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff
delete mode 100644 inst/rmd/h/bootstrap-3.3.5/fonts/glyphicons-halflings-regular.woff2
diff --git a/inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css b/inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css
index 23aaa5a8..7bfdac28 100644
--- a/inst/rmd/h/bootstrap-3.3.5/css/cosmo.min.css
@ -151,3 +285,6 @@ index 8c0c7de7..ce148218 100644
}
/*!
--
2.17.1

View File

@ -1,7 +1,7 @@
From 5aadb3111e7e9f14fa7d7b86247bf077a09e1e2a Mon Sep 17 00:00:00 2001
From 0e42fcf95c2ae1809642ff1baa67c37a72e6374e Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 21 Apr 2018 06:02:19 -0400
Subject: [PATCH 8/10] Add original non-minified Bootswatch themes.
Subject: [PATCH 7/9] Add original non-minified Bootswatch themes.
cd inst/rmd/h/bootstrap-3.3.5/css/
for theme in cerulean cosmo flatly journal lumen paper readable sandstone simplex spacelab united yeti; do
@ -10,18 +10,18 @@ done
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
inst/rmd/h/bootstrap-3.3.5/css/cerulean.css | 6904 +++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/cosmo.css | 6939 ++++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/flatly.css | 7025 ++++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/journal.css | 6851 +++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/lumen.css | 7176 ++++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/paper.css | 7519 ++++++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/readable.css | 6875 +++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/sandstone.css | 6913 +++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/simplex.css | 6913 +++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/spacelab.css | 6961 ++++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/united.css | 6773 +++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/yeti.css | 7069 ++++++++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/cerulean.css | 6904 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/cosmo.css | 6939 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/flatly.css | 7025 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/journal.css | 6851 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/lumen.css | 7176 +++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/paper.css | 7519 ++++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/readable.css | 6875 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/sandstone.css | 6913 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/simplex.css | 6913 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/spacelab.css | 6961 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/united.css | 6773 ++++++++++++++++
inst/rmd/h/bootstrap-3.3.5/css/yeti.css | 7069 ++++++++++++++++
12 files changed, 83918 insertions(+)
create mode 100644 inst/rmd/h/bootstrap-3.3.5/css/cerulean.css
create mode 100644 inst/rmd/h/bootstrap-3.3.5/css/cosmo.css
@ -84027,5 +84027,5 @@ index 00000000..652e1412
+ color: #222222;
+}
--
2.14.3
2.17.1

View File

@ -1,7 +1,7 @@
From 5b0f1a8af46808015a59ac1ad1d625a29a741c1d Mon Sep 17 00:00:00 2001
From ee945b51b8a5f10569f0f216a3130f66c702f51c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sun, 22 Apr 2018 04:54:16 -0400
Subject: [PATCH 9/10] Add source for code-prettify.
Subject: [PATCH 8/9] Add source for code-prettify.
cd inst/rmd/ioslides/ioslides-13.5.1/js/prettify
mkdir src
@ -12,10 +12,10 @@ done
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
.../ioslides-13.5.1/js/prettify/src/lang-tex.js | 46 +
.../ioslides-13.5.1/js/prettify/src/lang-yaml.js | 27 +
.../ioslides-13.5.1/js/prettify/src/prettify.css | 52 +
.../ioslides-13.5.1/js/prettify/src/prettify.js | 1655 ++++++++++++++++++++
.../js/prettify/src/lang-tex.js | 46 +
.../js/prettify/src/lang-yaml.js | 27 +
.../js/prettify/src/prettify.css | 52 +
.../js/prettify/src/prettify.js | 1655 +++++++++++++++++
4 files changed, 1780 insertions(+)
create mode 100644 inst/rmd/ioslides/ioslides-13.5.1/js/prettify/src/lang-tex.js
create mode 100644 inst/rmd/ioslides/ioslides-13.5.1/js/prettify/src/lang-yaml.js
@ -1827,5 +1827,5 @@ index 00000000..10c9fb73
+ }
+})();
--
2.14.3
2.17.1

View File

@ -1,7 +1,7 @@
From 05928b0d1eb6ebba3fcfe67939592f5e11926f51 Mon Sep 17 00:00:00 2001
From 775c6e4ee8ce8afdec6a5c5dd810bd4771ea7eb6 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 21 Apr 2018 06:25:19 -0400
Subject: [PATCH 10/10] Skip shiny tests.
Subject: [PATCH 9/9] Skip shiny tests.
These would cause a dependency loop.
@ -40,5 +40,5 @@ index f27360f1..a6635f00 100644
# file input is always NULL
ui <- params_value_to_ui(shiny::fileInput, "anything", FALSE)
--
2.14.3
2.17.1

View File

@ -5,7 +5,7 @@
%global with_suggests 0
Name: R-%{packname}
Version: 1.9
Version: 1.10
Release: 1%{?dist}
Summary: Dynamic Documents for R
@ -14,14 +14,14 @@ License: GPLv3 and ASL 2.0 and BSD and MIT and OFL and W3C
URL: https://cran.r-project.org/web/packages/%{packname}/index.html
Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
Patch0001: 0001-Remove-bundled-bits.patch
Patch0002: 0008-Add-original-non-minified-Bootswatch-themes.patch
Patch0003: 0009-Add-source-for-code-prettify.patch
Patch0004: 0010-Skip-shiny-tests.patch
Patch0002: 0007-Add-original-non-minified-Bootswatch-themes.patch
Patch0003: 0008-Add-source-for-code-prettify.patch
Patch0004: 0009-Skip-shiny-tests.patch
# Here's the R view of the dependencies world:
# Depends:
# Imports: R-tools, R-utils, R-knitr >= 1.14, R-yaml >= 2.1.5, R-htmltools >= 0.3.5, R-evaluate >= 0.8, R-base64enc, R-jsonlite, R-rprojroot, R-mime, R-methods, R-stringr >= 1.2.0
# Suggests: R-tinytex, R-shiny >= 0.11, R-tufte, R-testthat, R-digest, R-tibble
# Imports: R-tools, R-utils, R-knitr >= 1.18, R-yaml >= 2.1.5, R-htmltools >= 0.3.5, R-evaluate >= 0.8, R-base64enc, R-jsonlite, R-rprojroot, R-mime, R-tinytex >= 0.3, R-methods, R-stringr >= 1.2.0
# Suggests: R-shiny >= 0.11, R-tufte, R-testthat, R-digest, R-dygraphs, R-tibble
# LinkingTo:
# Enhances:
@ -30,52 +30,55 @@ Requires: R-core
Requires: pandoc >= 1.12.3
Requires: pandoc-citeproc
Requires: R-base64enc
Requires: R-evaluate >= 0.8
Requires: R-htmltools >= 0.3.5
Requires: R-jsonlite
Requires: R-knitr >= 1.14
Requires: R-methods
Requires: R-mime
Requires: R-rprojroot
Requires: R-stringr >= 1.2.0
Requires: R-tools
Requires: R-utils
Requires: R-knitr >= 1.18
Requires: R-yaml >= 2.1.5
Suggests: R-digest
Requires: R-htmltools >= 0.3.5
Requires: R-evaluate >= 0.8
Requires: R-base64enc
Requires: R-jsonlite
Requires: R-rprojroot
Requires: R-mime
Requires: R-tinytex >= 0.3
Requires: R-methods
Requires: R-stringr >= 1.2.0
Suggests: R-shiny >= 0.11
Suggests: R-tibble
Suggests: R-tufte
Suggests: R-digest
Suggests: R-tibble
BuildRequires: R-devel
BuildRequires: tex(latex)
BuildRequires: pandoc >= 1.12.3
BuildRequires: pandoc-citeproc
BuildRequires: R-base64enc
BuildRequires: R-evaluate >= 0.8
BuildRequires: R-htmltools >= 0.3.5
BuildRequires: R-jsonlite
BuildRequires: R-knitr >= 1.14
BuildRequires: R-methods
BuildRequires: R-mime
BuildRequires: R-rprojroot
BuildRequires: R-stringr >= 1.2.0
BuildRequires: R-tools
BuildRequires: R-utils
BuildRequires: R-knitr >= 1.18
BuildRequires: R-yaml >= 2.1.5
BuildRequires: R-digest
BuildRequires: R-htmltools >= 0.3.5
BuildRequires: R-evaluate >= 0.8
BuildRequires: R-base64enc
BuildRequires: R-jsonlite
BuildRequires: R-rprojroot
BuildRequires: R-mime
BuildRequires: R-tinytex >= 0.3
BuildRequires: R-methods
BuildRequires: R-stringr >= 1.2.0
BuildRequires: R-testthat
BuildRequires: R-digest
%if %{with_suggests}
BuildRequires: R-shiny >= 0.11
BuildRequires: R-tibble
BuildRequires: R-tufte
BuildRequires: R-dygraphs
BuildRequires: R-tibble
%endif
BuildRequires: fontawesome-fonts = 4.7.0
BuildRequires: fontawesome-fonts-web = 4.7.0
Suggests: fontawesome-fonts = 4.7.0
Suggests: fontawesome-fonts-web = 4.7.0
#BuildRequires: fontawesome-fonts = 4.7.0
#BuildRequires: fontawesome-fonts-web = 4.7.0
#Suggests: fontawesome-fonts = 4.7.0
#Suggests: fontawesome-fonts-web = 4.7.0
Provides: bundled(fontawesome-fonts) = 5.0.13
Provides: bundled(fontawesome-fonts-web) = 5.0.13
# These are not all packaged, but should *probably* be the names if they are.
@ -150,11 +153,11 @@ rm inst/rmd/ioslides/ioslides-13.5.1/fonts/SourceCodePro.ttf
ln -s /usr/share/fonts/adobe-source-code-pro/SourceCodePro-Regular.otf inst/rmd/ioslides/ioslides-13.5.1/fonts/SourceCodePro-Regular.otf
# Remove bundled jquery.
rm -r inst/rmd/h/jquery-1.11.3 inst/rmd/h/jquery-AUTHORS.txt
# Remove bundled FontAwesome.
rm -r inst/rmd/h/font-awesome-4.5.0
mkdir inst/rmd/h/font-awesome-4.7.0
ln -s /usr/share/font-awesome-web/css inst/rmd/h/font-awesome-4.7.0/css
ln -s /usr/share/fonts/fontawesome inst/rmd/h/font-awesome-4.7.0/fonts
# Remove bundled FontAwesome. (too new to remove)
#rm -r inst/rmd/h/font-awesome-4.5.0
#mkdir inst/rmd/h/font-awesome-4.7.0
#ln -s /usr/share/font-awesome-web/css inst/rmd/h/font-awesome-4.7.0/css
#ln -s /usr/share/fonts/fontawesome inst/rmd/h/font-awesome-4.7.0/fonts
# Remove bundled highlight.js.
rm -r inst/rmd/h/highlightjs
# Remove bundled fonts from bootstrap.
@ -238,7 +241,7 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname}
%{rlibdir}/%{packname}/rmd/h/_navbar.html
%{rlibdir}/%{packname}/rmd/h/default.html
%{rlibdir}/%{packname}/rmd/h/bootstrap-3.3.5
%{rlibdir}/%{packname}/rmd/h/font-awesome-4.7.0
%{rlibdir}/%{packname}/rmd/h/fontawesome
%{rlibdir}/%{packname}/rmd/h/ionicons-2.0.1
%{rlibdir}/%{packname}/rmd/h/jqueryui-1.11.4
%{rlibdir}/%{packname}/rmd/h/jqueryui-AUTHORS.txt
@ -253,5 +256,8 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname}
%changelog
* Fri Jun 22 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.10-1
- Update to latest version
* Sun Apr 22 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.9-1
- initial package for Fedora

View File

@ -1 +1 @@
SHA512 (rmarkdown_1.9.tar.gz) = bc3ee620b6e10c0bc94132869a5bc12c0172404b1ae0ca2d8fb9c4b2b9876c3ad40fdfb3e008f6ebf47da56262c90cf02b7b97051a77a9197c3604e8cd6a6ebf
SHA512 (rmarkdown_1.10.tar.gz) = 5ebec52165112dea20ccf916b6925cf4d19ef977707b129ff2c6d7b0cc60f3d25e3c1cca7f96fd975b9fc062e3e0a77900273f8ed63ddfa8db9278893aa1e353