From 00efe7ec9449c1c01f699aede8653a0cd67c3332 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 7 Jul 2023 19:08:01 +0900 Subject: [PATCH] Fix default-fonts- pulls in serif --- langpacks.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/langpacks.spec b/langpacks.spec index 5083bcc..e1b7b46 100644 --- a/langpacks.spec +++ b/langpacks.spec @@ -1,6 +1,6 @@ Name: langpacks Version: 4.0 -Release: 0.12%{?dist} +Release: 0.13%{?dist} Summary: Langpacks meta-package License: GPL-2.0-or-later @@ -1397,7 +1397,9 @@ local corefonts = { sans ="default-fonts-core-sans = %{version}-%{release}", local sans_deps = {} for i = 1, #langpacks_package_list do + -- dependency list for default-fonts- local default_deps = {} + -- dependency list for default-fonts-extra- local extra_deps = {} local lang = langpacks_package_list[i]["lang"] rpm.define("langcode " .. lang .. "\n") @@ -1421,8 +1423,8 @@ for i = 1, #langpacks_package_list do local has_default = false local default_face = langpacks_package_list[i]["default"]["face"] and langpacks_package_list[i]["default"]["face"] or "sans" for j = 1, #face do - local current = langpacks_package_list[i]["default"][face[j]] - if current ~= "" then + local current = {langpacks_package_list[i]["default"][face[j]]} + if current[1] ~= "" then has_default = true end end @@ -1450,7 +1452,7 @@ for i = 1, #langpacks_package_list do end else for k = 1, #current do - table.insert(default_deps, current[k]) + table.insert(extra_deps, current[k]) if is_cjk(lang) then table.insert(cjk_deps[face[j]], current[k])