diff --git a/langpacks.spec b/langpacks.spec index a3b1a1e..bc4f760 100644 --- a/langpacks.spec +++ b/langpacks.spec @@ -315,7 +315,7 @@ local langpacks_package_list = { }, }, { lang="en", fclang="", langname="English", default={ - sans="", + sans="", -- Do not add anything here. default-fonts-en is equivalent to default-fonts-core-sans serif="", mono="" }, recommends={ "liberation-sans-fonts", @@ -1388,13 +1388,11 @@ This package provides %{_langname} langpacks meta-package. end local other_deps = { sans={}, serif={}, mono={} } -local other_prov = "" local cjk_deps = { sans={}, serif={}, mono={} } -local cjk_prov = "" local face = { "sans", "serif", "mono" } -local corefonts = { sans ="default-fonts-core-sans", - serif="default-fonts-core-serif", - mono ="default-fonts-core-mono" +local corefonts = { sans ="default-fonts-core-sans = %{version}-%{release}", + serif="default-fonts-core-serif = %{version}-%{release}", + mono ="default-fonts-core-mono = %{version}-%{release}" } for i = 1, #langpacks_package_list do @@ -1431,27 +1429,31 @@ for i = 1, #langpacks_package_list do -- Only install sans fonts as default fonts per lang if face[j] == "sans" then - table.insert(default_deps, current) - table.insert(extra_deps, "default-fonts-" .. lang) + if lang == "en" then + -- Special take care of required packages + for k = 1, #core_font_package_list["default"]["sans"] do + table.insert(default_deps, core_font_package_list["default"]["sans"][k]) + end + else + table.insert(default_deps, current) + end + table.insert(extra_deps, "default-fonts-" .. lang .. " = %{version}-%{release}") -- Provide font(:lang=) deps for sans only - prov = append_fontprov("", lang) + prov = append_fontprov("", lowerorth) + + if is_cjk(lang) then + table.insert(cjk_deps[face[j]], "default-fonts-" .. lang .. " = %{version}-%{release}") + else + table.insert(other_deps[face[j]], "default-fonts-" .. lang .. " = %{version}-%{release}") + end else table.insert(extra_deps, current) - end - if is_cjk(lang) then - table.insert(cjk_deps[face[j]], current) - else - table.insert(other_deps[face[j]], current) - end - end - - if (lang == orth or orth == "") then - --Provide font(:lang) only when lang is recognized by fontconfig - if is_cjk(lang) then - cjk_prov = append_fontprov(cjk_prov, lowerorth) - else - other_prov = append_fontprov(other_prov, lowerorth) + if is_cjk(lang) then + table.insert(cjk_deps[face[j]], current) + else + table.insert(other_deps[face[j]], current) + end end end @@ -1478,12 +1480,12 @@ for i = 1, #langpacks_package_list do end for i = 1, #face do - deffontpkg("other-" .. face[i], "", "default fonts", "non-CJK languages", build_deps(other_prov, "Requires", drop_duplicate(other_deps[face[i]]))) - deffontpkg("cjk-" .. face[i], "", "default fonts", "CJK languages", build_deps(cjk_prov, "Requires", drop_duplicate(cjk_deps[face[i]]))) + deffontpkg("other-" .. face[i], "", "default fonts", "non-CJK languages", build_deps("", "Requires", drop_duplicate(other_deps[face[i]]))) + deffontpkg("cjk-" .. face[i], "", "default fonts", "CJK languages", build_deps("", "Requires", drop_duplicate(cjk_deps[face[i]]))) end ---core font packages -local coreface = { "sans", "serif", "mono", "emoji", "math" } +--core font packages except sans - core-sans is equivalent to default-fonts-en +local coreface = { "serif", "mono", "emoji", "math" } for i = 1, #coreface do deffontpkg("core-" .. coreface[i], "", "default fonts", "Latin languages", build_deps("", "Requires", drop_duplicate(core_font_package_list["default"][coreface[i]]))) end @@ -1491,9 +1493,9 @@ end %package -n default-fonts Summary: Meta package to install all the default fonts -Requires: default-fonts-core -Requires: default-fonts-cjk -Requires: default-fonts-other +Requires: default-fonts-core = %{version}-%{release} +Requires: default-fonts-cjk = %{version}-%{release} +Requires: default-fonts-other = %{version}-%{release} %description -n default-fonts This package provides easier way to install all the default fonts meta packages for all the languages. @@ -1503,11 +1505,11 @@ This package provides easier way to install all the default fonts meta packages %package -n default-fonts-core Summary: Meta package to install sans/serif/mono/emoji/math default fonts meta packages for Latin -Requires: default-fonts-core-sans -Requires: default-fonts-core-serif -Requires: default-fonts-core-mono -Requires: default-fonts-core-emoji -Requires: default-fonts-core-math +Requires: default-fonts-core-sans = %{version}-%{release} +Requires: default-fonts-core-serif = %{version}-%{release} +Requires: default-fonts-core-mono = %{version}-%{release} +Requires: default-fonts-core-emoji = %{version}-%{release} +Requires: default-fonts-core-math = %{version}-%{release} %description -n default-fonts-core This package provides easier way to install all variants of default fonts meta packages for Latin. @@ -1515,11 +1517,21 @@ This package provides easier way to install all variants of default fonts meta p %files -n default-fonts-core %{_datadir}/metainfo/org.fedoraproject.default-fonts-core.metainfo.xml +%package -n default-fonts-core-sans +Summary: Meta package to install default fonts for Latin languages +Requires: default-fonts-en = %{version}-%{release} + +%description -n default-fonts-core-sans +This package provides default fonts package set(s) for Latin languages + +%files -n default-fonts-core-sans +%{_datadir}/metainfo/org.fedoraproject.default-fonts-core-sans.metainfo.xml + %package -n default-fonts-cjk Summary: Meta package to install sans/serif/mono/emoji/math default fonts meta packages for CJK. -Requires: default-fonts-cjk-sans -Requires: default-fonts-cjk-serif -Requires: default-fonts-cjk-mono +Requires: default-fonts-cjk-sans = %{version}-%{release} +Requires: default-fonts-cjk-serif = %{version}-%{release} +Requires: default-fonts-cjk-mono = %{version}-%{release} %description -n default-fonts-cjk This package provides easier way to install all variants of default fonts meta packages @@ -1530,9 +1542,9 @@ for CJK languages. %package -n default-fonts-other Summary: Meta package to install sans/serif/mono/emoji/math default fonts meta packages for non-CJK. -Requires: default-fonts-other-sans -Requires: default-fonts-other-serif -Requires: default-fonts-other-mono +Requires: default-fonts-other-sans = %{version}-%{release} +Requires: default-fonts-other-serif = %{version}-%{release} +Requires: default-fonts-other-mono = %{version}-%{release} %description -n default-fonts-other This package provides easier way to install all variants of default fonts meta packages