From 4f52cbe0a04c8f888751b4f45f92a1aed33e4a54 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 10 Jul 2023 13:24:47 +0900 Subject: [PATCH] Fix deps langpacks-core-LL should pulls in default-fonts-LL and langpacks-LL should pulls in langpacks-font-LL. --- langpacks.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/langpacks.spec b/langpacks.spec index 8ba4995..3e88ad9 100644 --- a/langpacks.spec +++ b/langpacks.spec @@ -1305,7 +1305,7 @@ local function defcorepkg(lang, fontlang, langname, inputmethod) local templ = [[ %package core-%{_lang} Summary: %{_langname} langpacks core meta-package -Requires: langpacks-font-%{_fontlang} +Requires: default-fonts-%{_fontlang} %{?_req} %description core-%{_lang} @@ -1361,11 +1361,12 @@ end -- --Package template for langpacks- -- -local function defmetapkg(lang, langname, deps) +local function defmetapkg(lang, fontlang, langname, deps) local templ = [[ %package %{_lang} Summary: %{_langname} langpacks meta-package Requires: %{name}-core-%{_lang} +Requires: %{name}-font-%{_fontlang} %{?_req} %description %{_lang} @@ -1376,12 +1377,14 @@ This package provides %{_langname} langpacks meta-package. ]] rpm.define("_lang " .. lang) + rpm.define("_fontlang " .. fontlang) rpm.define("_langname " .. langname) if deps ~= "" then rpm.define("_req %{expand:" .. deps .. "}") end print(rpm.expand(templ)) rpm.undefine("_lang") + rpm.undefine("_fontlang") rpm.undefine("_langname") rpm.undefine("_req") end @@ -1481,7 +1484,7 @@ for i = 1, #langpacks_package_list do local metarecd = (tonumber(rpm.expand("%{fedora}")) ~= 0 and langpacks_package_list[i]["meta"]["fedora_recommends"] ~= nil and langpacks_package_list[i]["meta"]["fedora_recommends"] or langpacks_package_list[i]["meta"]["recommends"]) local deps = build_deps("", "Requires", drop_duplicate(metadeps)) deps = build_deps(deps, "Recommends", drop_duplicate(metarecd)) - defmetapkg(lang, langname, deps) + defmetapkg(lang, fclang, langname, deps) end for i = 1, #face do