rpms/langpacks
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix deps

Browse Source 
langpacks-core-LL should pulls in default-fonts-LL and
langpacks-LL should pulls in langpacks-font-LL.
This commit is contained in:
Akira TAGOH 2023-07-10 13:24:47 +09:00
parent 18550c5c47
commit 4f52cbe0a0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
langpacks.spec
View File

@ -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-<lang>
--
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