From e93b3d601f4e2b5c4a78e599c9d3cf171cc87e49 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 12 May 2021 19:27:05 +0900 Subject: [PATCH] Add some Obsoletes lines for dropped sub packages. --- google-noto-fonts.spec | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec index 4f89d6f..e4806aa 100644 --- a/google-noto-fonts.spec +++ b/google-noto-fonts.spec @@ -16,7 +16,7 @@ in Unicode.\ Name: %{fontname}-fonts Version: 20201206 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hinted and Non Hinted OpenType fonts for Unicode scripts License: OFL URL: https://github.com/googlefonts/noto-fonts/ @@ -55,7 +55,7 @@ local subpackages = { { alias="sans-serif", family="Sans" }, { alias="sans-serif", family="Sans Display", priority=rpm.expand('%{lprio}'), - obsolete="sans-ui" + obsoletes={ "sans-ui" } }, { alias="sans-serif", family="Sans Adlam" }, { alias="sans-serif", family="Sans Adlam Unjoined" }, @@ -114,7 +114,7 @@ local subpackages = { }, { alias="sans-serif", family="Sans Hanifi Rohingya" }, { alias="sans-serif", family="Sans Hanunoo", lang={ "hnn" }, - obsolete="sans-hanunno" + obsoletes={ "sans-hanunno" } }, { alias="sans-serif", family="Sans Hatran" }, { alias="sans-serif", family="Sans Hebrew", lang={ "he" } }, @@ -145,7 +145,7 @@ local subpackages = { { alias="sans-serif", family="Sans Limbu", lang={ "lif" } }, { alias="sans-serif", family="Sans Linear A" }, { alias="sans-serif", family="Sans Linear B", - obsolete="sans-linearb" + obsoletes={ "sans-linearb" } }, { alias="sans-serif", family="Sans Lisu" }, { alias="sans-serif", family="Sans Lycian" }, @@ -164,7 +164,7 @@ local subpackages = { }, { alias="sans-serif", family="Sans Mayan Numerals" }, { alias="sans-serif", family="Sans Meetei Mayek", - obsolete="sans-meeteimayek" + obsoletes={ "sans-meeteimayek" } }, { alias="sans-serif", family="Sans Medefaidrin" }, { alias="sans-serif", family="Sans Mende Kikakui" }, @@ -173,7 +173,7 @@ local subpackages = { { alias="sans-serif", family="Sans Modi" }, { alias="sans-serif", family="Sans Mongolian", lang={ "mn-cn" } }, { alias="monospace", family="Sans Mono", - obsolete="mono" + obsoletes={ "mono" } }, { alias="sans-serif", family="Sans Mro" }, { alias="sans-serif", family="Sans Multani" }, @@ -229,7 +229,9 @@ local subpackages = { { alias="fantasy", family="Sans Symbols" }, { alias="fantasy", family="Sans Symbols2" }, - { alias="sans-serif", family="Sans Syriac", lang={ "syr" } }, + { alias="sans-serif", family="Sans Syriac", lang={ "syr" }, + obsoletes={ "sans-syriac-eastern", "sans-syriac-estrangela", "sans-syriac-western" } + }, { alias="sans-serif", family="Sans Tagalog" }, { alias="sans-serif", family="Sans Tagbanwa", lang={ "twb" } }, { alias="sans-serif", family="Sans Takri" }, @@ -277,7 +279,7 @@ local subpackages = { { alias="serif", family="Serif Ahom" }, { alias="serif", family="Serif Armenian", lang={ "hy" } }, { alias="serif", family="Serif Balinese", lang={ "ban" }, - obsolete="sans-balinese" + obsoletes={ "sans-balinese" } }, { alias="serif", family="Serif Bengali", lang={ "bn" } }, { alias="serif", family="Serif Devanagari", lang={ "bh", "bho", "brx", "doi", "hi", "hne", "kok", "ks@devanagari", "mai", "mr", "ne", "sa", "sat", "sd@devanagari" } }, @@ -304,7 +306,9 @@ local subpackages = { { alias="serif", family="Serif Tangut" }, { alias="serif", family="Serif Telugu", lang={ "te" } }, { alias="serif", family="Serif Thai", lang={ "th" } }, - { alias="serif", family="Serif Tibetan", lang={ "bo", "dz" } }, + { alias="serif", family="Serif Tibetan", lang={ "bo", "dz" }, + obsoletes={ "sans-tibetan" } + }, { alias="serif", family="Serif Yezidi" }, { alias="serif", family="Traditional Nushu" }, @@ -392,7 +396,9 @@ local subpackages = { { alias="monospace", variable=true, family="Sans Mono" }, { alias="sans-serif", variable=true, family="Sans Mro" }, { alias="sans-serif", variable=true, family="Sans Multani" }, - { alias="sans-serif", variable=true, family="Sans Myanmar", lang={ "my" } }, + { alias="sans-serif", variable=true, family="Sans Myanmar", lang={ "my" }, + obsoletes={ "serif-myanmar-vf" } + }, { alias="sans-serif", variable=true, family="Sans Myanmar UI", lang={ "my" }, priority=rpm.expand('%{lprio}') }, @@ -779,14 +785,20 @@ Noto ]] .. table.family .. (table.variable and ' variable' or '') .. " font." _fcconflist = (_fcconflist ~= '' and _fcconflist .. ':' or '') .. fcconf _metafilelist = (_metafilelist ~= '' and _metafilelist .. ':' or '') .. metaname + local obsoletes = '' + + if table.obsoletes then + for i = 1, #table.obsoletes do + obsoletes = obsoletes .. "Obsoletes: %{_fontname}-" .. table.obsoletes[i] .. "-fonts < %{version}-%{release}\n" + end + end print(rpm.expand([[ %package -n ]] .. table.pkgname .. "\n" .. [[ Summary: ]] .. table.summary .. "\n" .. [[ Requires: fontpackages-filesystem Requires: %{name}-common = %{version}-%{release} -]] .. (table.obsolete and [[ -Obsoletes: %{_fontname}-]] .. table.obsolete .. [[-fonts < %{version}-%{release}]] or '') .. [[ +]] .. obsoletes .. [[ %description -n ]] .. table.pkgname .. "\n" .. table.description .. "\n" .. [[ @@ -879,6 +891,9 @@ done %changelog +* Wed May 12 2021 Akira TAGOH - 20201206-2 +- Add some Obsoletes lines for dropped sub packages. + * Fri Apr 9 2021 Akira TAGOH - 20201206-1 - Updates to 20201206. Resolves: rhbz#1899847