diff mbox series

docs: sphinx-pre-install fix-noto-sans-cjk on fedora

Message ID 20240124043918.31771-1-andrewjballance@gmail.com
State New
Headers
Series docs: sphinx-pre-install fix-noto-sans-cjk on fedora |

Commit Message

Andrew Ballance Jan. 24, 2024, 4:39 a.m. UTC 
  fedora 38 and later changed the directory and package name that
provides NotoSansCJK-Regular.ttc. this adds the new search path and
suggests the correct package if on fedora 38 or later.

Signed-off-by: Andrew Ballance <andrewjballance@gmail.com>
---
 scripts/sphinx-pre-install | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Jonathan Corbet Jan. 30, 2024, 9:01 p.m. UTC | #1 
Andrew Ballance <andrewjballance@gmail.com> writes:

> fedora 38 and later changed the directory and package name that
> provides NotoSansCJK-Regular.ttc. this adds the new search path and
> suggests the correct package if on fedora 38 or later.
>
> Signed-off-by: Andrew Ballance <andrewjballance@gmail.com>
> ---
>  scripts/sphinx-pre-install | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

Applied, thanks.

jon
diff mbox series

Patch

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index 25aefbb35377..948f284bfc8b 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -421,6 +421,7 @@  sub give_redhat_hints()
 	#
 	my $old = 0;
 	my $rel;
+	my $noto_sans_redhat = "google-noto-sans-cjk-ttc-fonts";
 	$rel = $1 if ($system_release =~ /release\s+(\d+)/);
 
 	if (!($system_release =~ /Fedora/)) {
@@ -438,6 +439,9 @@  sub give_redhat_hints()
 		if ($rel && $rel < 26) {
 			$old = 1;
 		}
+		if ($rel && $rel >= 38) {
+			$noto_sans_redhat = "google-noto-sans-cjk-fonts";
+		}
 	}
 	if (!$rel) {
 		printf("Couldn't identify release number\n");
@@ -446,8 +450,9 @@  sub give_redhat_hints()
 	}
 
 	if ($pdf) {
-		check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
-				   "google-noto-sans-cjk-ttc-fonts", 2);
+		check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
+				    "/usr/share/fonts/google-noto-sans-cjk-fonts/NotoSansCJK-Regular.ttc"],
+				   $noto_sans_redhat, 2);
 	}
 
 	check_rpm_missing(\@fedora26_opt_pkgs, 2) if ($pdf && !$old);