Notification time stamped 2020-09-30 21:41:51 UTC
From 1d2518a2743e220d78026566476250972daadc6b Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sep 30 2020 21:30:23 +0000
Subject: Fix font unbundling again.
---
diff --git a/R-rmarkdown.spec b/R-rmarkdown.spec
index 939df99..709420f 100644
--- a/R-rmarkdown.spec
+++ b/R-rmarkdown.spec
@@ -150,6 +150,13 @@ rm inst/rmd/h/bootstrap/css/fonts/Ubuntu.ttf
chmod -x inst/rmd/h/ionicons/{LICENSE,css/*.css,fonts/*.ttf}
chmod -x inst/rmd/ioslides/ioslides-13.5.1/js/hammer.js
+# Fix fonts using new paths.
+%if 0%{?fedora} >= 33
+for f in Bold It Light Regular; do
+ ln -sf /usr/share/fonts/adobe-source-sans-pro-fonts/SourceSans3-${f}.otf
inst/rmd/h/bootstrap/css/fonts/SourceSansPro-${f}.otf
+done
+%endif
+
# This does nothing but reset the -n path.
%setup -q -D -T -n %{packname}
@@ -204,7 +211,11 @@ for f in Light Medium Bold; do
ln -sf /usr/share/fonts/google-roboto/Roboto-${f}.ttf
rmd/h/bootstrap/css/fonts/Roboto${f}.ttf
done
for f in Bold It Light Regular; do
+%if 0%{?fedora} >= 33
+ ln -sf /usr/share/fonts/adobe-source-sans-pro-fonts/SourceSans3-${f}.otf
rmd/h/bootstrap/css/fonts/SourceSansPro-${f}.otf
+%else
ln -sf /usr/share/fonts/source-sans-pro/SourceSansPro-${f}.otf
rmd/h/bootstrap/css/fonts/SourceSansPro-${f}.otf
+%endif
done
ln -sf /usr/share/fonts/glyphicons-halflings/glyphicons-halflings-regular.ttf
rmd/h/bootstrap/fonts/glyphicons-halflings-regular.ttf
popd
@@ -263,6 +274,7 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname}
%changelog
* Wed Sep 30 2020 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.4-1
- Update to latest version (#1884046)
+- Fix Rawhide/f33 font unbundling for Adobe SourceSans
* Sat Aug 01 2020 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.3-1
- Update to latest version
https://src.fedoraproject.org/rpms/R-rmarkdown/c/1d2518a2743e220d78026566...