From 09a1edd3c2de9ef4e939d4da7f980bb53e2cb44a Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 16 Nov 2021 18:02:48 +0900 Subject: [PATCH] Have higher priority google-noto-sans-gurmukhi-vf-fonts than google-noto-sans-gurmukhi-fonts. --- google-noto-fonts.spec | 91 ++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec index a083ef3..47500a2 100644 --- a/google-noto-fonts.spec +++ b/google-noto-fonts.spec @@ -16,7 +16,7 @@ in Unicode.\ Name: %{fontname}-fonts Version: 20201206 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Hinted and Non Hinted OpenType fonts for Unicode scripts License: OFL URL: https://github.com/googlefonts/noto-fonts/ @@ -55,14 +55,14 @@ local subpackages = { { alias="sans-serif", family="Sans" }, { alias="sans-serif", family="Sans Display", priority=rpm.expand('%{lprio}'), - obsoletes={ "sans-ui" } + obsoletes={ "sans-ui" }, nogroup=1 }, { alias="sans-serif", family="Sans Adlam" }, { alias="sans-serif", family="Sans Adlam Unjoined" }, { alias="sans-serif", family="Sans Anatolian Hieroglyphs" }, { alias="sans-serif", family="Sans Arabic", lang={ "ar" } }, { alias="sans-serif", family="Sans Arabic UI", lang={ "ar" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Armenian", lang={ "hy" } }, { alias="sans-serif", family="Sans Avestan" }, @@ -72,7 +72,7 @@ local subpackages = { { alias="sans-serif", family="Sans Batak", lang={ "bbc" } }, { alias="sans-serif", family="Sans Bengali", lang= { "bn" } }, { alias="sans-serif", family="Sans Bengali UI", lang= { "bn" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Bhaiksuki" }, { alias="sans-serif", family="Sans Brahmi" }, @@ -90,7 +90,7 @@ local subpackages = { { alias="sans-serif", family="Sans Deseret" }, { alias="sans-serif", family="Sans Devanagari", lang={ "bh", "bho", "brx", "doi", "hi", "hne", "kok", "ks@devanagari", "mai", "mr", "ne", "sa", "sat", "sd@devanagari" } }, { alias="sans-serif", family="Sans Devanagari UI", lang={ "bh", "bho", "brx", "doi", "hi", "hne", "kok", "ks@devanagari", "mai", "mr", "ne", "sa", "sat", "sd@devanagari" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Duployan" }, { alias="sans-serif", family="Sans Egyptian Hieroglyphs" }, @@ -103,14 +103,12 @@ local subpackages = { { alias="sans-serif", family="Sans Grantha" }, { alias="sans-serif", family="Sans Gujarati", lang={ "gu" } }, { alias="sans-serif", family="Sans Gujarati UI", lang={ "gu" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Gunjala Gondi" }, - { alias="sans-serif", family="Sans Gurmukhi", lang={ "pa" }, - priority=rpm.expand('%{hprio}') - }, + { alias="sans-serif", family="Sans Gurmukhi", lang={ "pa" } }, { alias="sans-serif", family="Sans Gurmukhi UI", lang={ "pa" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Hanifi Rohingya" }, { alias="sans-serif", family="Sans Hanunoo", lang={ "hnn" }, @@ -126,20 +124,20 @@ local subpackages = { { alias="sans-serif", family="Sans Kaithi" }, { alias="sans-serif", family="Sans Kannada", lang={ "kn" } }, { alias="sans-serif", family="Sans Kannada UI", lang={ "kn" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Kayah Li" }, { alias="sans-serif", family="Sans Kharoshthi" }, { alias="sans-serif", family="Sans Khmer", lang={ "km" } }, { alias="sans-serif", family="Sans Khmer UI", lang={ "km" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Khojki" }, { alias="sans-serif", family="Sans Khudawadi" }, { alias="sans-serif", family="Sans Lao", lang={ "lo" } }, - { alias="sans-serif", family="Sans Lao Looped", lang={ "lo" } }, + { alias="sans-serif", family="Sans Lao Looped", lang={ "lo" }, nogroup=1 }, { alias="sans-serif", family="Sans Lao UI", lang={ "lo" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Lepcha", lang={ "lep" } }, { alias="sans-serif", family="Sans Limbu", lang={ "lif" } }, @@ -153,7 +151,7 @@ local subpackages = { { alias="sans-serif", family="Sans Mahajani" }, { alias="sans-serif", family="Sans Malayalam", lang={ "ml" } }, { alias="sans-serif", family="Sans Malayalam UI", lang={ "ml" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Mandaic" }, { alias="sans-serif", family="Sans Manichaean" }, @@ -179,7 +177,7 @@ local subpackages = { { alias="sans-serif", family="Sans Multani" }, { alias="sans-serif", family="Sans Myanmar", lang={ "my" } }, { alias="sans-serif", family="Sans Myanmar UI", lang={ "my" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Nabataean" }, { alias="sans-serif", family="Sans New Tai Lue", lang={ "khb" } }, @@ -198,7 +196,7 @@ local subpackages = { { alias="sans-serif", family="Sans Old Turkic" }, { alias="sans-serif", family="Sans Oriya", lang={ "or" } }, { alias="sans-serif", family="Sans Oriya UI", lang={ "or" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Osage" }, { alias="sans-serif", family="Sans Osmanya" }, @@ -218,7 +216,7 @@ local subpackages = { { alias="sans-serif", family="Sans SignWriting" }, { alias="sans-serif", family="Sans Sinhala", lang={ "si" } }, { alias="sans-serif", family="Sans Sinhala UI", lang={ "si" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Sogdian" }, { alias="sans-serif", family="Sans Sora Sompeng" }, @@ -240,20 +238,20 @@ local subpackages = { { alias="sans-serif", family="Sans Tai Viet" }, { alias="sans-serif", family="Sans Tamil", lang={ "ta" } }, { alias="sans-serif", family="Sans Tamil Supplement", lang={ "ta" }, - excludeci=true + excludeci=true, nogroup=1 }, { alias="sans-serif", family="Sans Tamil UI", lang={ "ta" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Telugu", lang={ "te" } }, { alias="sans-serif", family="Sans Telugu UI", lang={ "te" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Thaana", lang={ "dv" } }, { alias="sans-serif", family="Sans Thai", lang={ "th" } }, - { alias="sans-serif", family="Sans Thai Looped", lang={ "th" } }, + { alias="sans-serif", family="Sans Thai Looped", lang={ "th" }, nogroup=1 }, { alias="sans-serif", family="Sans Thai UI", lang={ "th" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", family="Sans Tifinagh", lang={ "ber-ma" } }, { alias="sans-serif", family="Sans Tifinagh APT", lang={ "ber-ma" } }, @@ -284,7 +282,7 @@ local subpackages = { { 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" } }, { alias="serif", family="Serif Display", - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="serif", family="Serif Dogra" }, { alias="serif", family="Serif Ethiopic", lang={ "am", "byn", "gez", "sid", "ti-er", "ti-et", "tig", "wal" } }, @@ -302,7 +300,7 @@ local subpackages = { { alias="serif", family="Serif Nyiakeng Puachue Hmong" }, { alias="serif", family="Serif Sinhala", lang={ "si" } }, { alias="serif", family="Serif Tamil", lang={ "ta" } }, - { alias="serif", family="Serif Tamil Slanted", lang={ "ta" } }, + { alias="serif", family="Serif Tamil Slanted", lang={ "ta" }, nogroup=1 }, { alias="serif", family="Serif Tangut" }, { alias="serif", family="Serif Telugu", lang={ "te" } }, { alias="serif", family="Serif Thai", lang={ "th" } }, @@ -315,7 +313,7 @@ local subpackages = { { alias="cursive", variable=true, family="Kufi Arabic", lang={ "ar" } }, { alias="cursive", variable=true, family="Naskh Arabic", lang={ "ar" } }, { alias="cursive", variable=true, family="Naskh Arabic UI", lang={ "ar" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="serif", variable=true, family="Rashi Hebrew", lang={ "he" } }, { alias="sans-serif", variable=true, family="Sans" }, @@ -324,7 +322,7 @@ local subpackages = { { alias="sans-serif", variable=true, family="Sans Anatolian Hieroglyphs" }, { alias="sans-serif", variable=true, family="Sans Arabic", lang={ "ar" } }, { alias="sans-serif", variable=true, family="Sans Arabic UI", lang={ "ar" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Armenian", lang={ "hy" } }, { alias="sans-serif", variable=true, family="Sans Avestan" }, @@ -333,7 +331,7 @@ local subpackages = { { alias="sans-serif", variable=true, family="Sans Bassa Vah" }, { alias="sans-serif", variable=true, family="Sans Bengali", lang={ "bn" } }, { alias="sans-serif", variable=true, family="Sans Bengali UI", lang={ "bn" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Buginese", lang={ "bug" } }, { alias="sans-serif", variable=true, family="Sans Buhid", lang={ "bku" } }, @@ -346,19 +344,21 @@ local subpackages = { { alias="sans-serif", variable=true, family="Sans Deseret" }, { alias="sans-serif", variable=true, family="Sans Devanagari", lang={ "bh", "bho", "brx", "doi", "hi", "hne", "kok", "ks@devanagari", "mai", "mr", "ne", "sa", "sat", "sd@devanagari" } }, { alias="sans-serif", variable=true, family="Sans Devanagari UI", lang={ "bh", "bho", "brx", "doi", "hi", "hne", "kok", "ks@devanagari", "mai", "mr", "ne", "sa", "sat", "sd@devanagari" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Display", - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Egyptian Hieroglyphs" }, { alias="sans-serif", variable=true, family="Sans Elymaic" }, { alias="sans-serif", variable=true, family="Sans Ethiopic", lang={ "am", "byn", "gez", "sid", "ti-er", "ti-et", "tig", "wal" } }, { alias="sans-serif", variable=true, family="Sans Georgian", lang={ "ka" } }, { alias="sans-serif", variable=true, family="Sans Gothic", lang={ "got" } }, - { alias="sans-serif", variable=true, family="Sans Gurmukhi", lang={ "pa" } }, + { alias="sans-serif", variable=true, family="Sans Gurmukhi", lang={ "pa" }, + priority=rpm.expand('%{hprio}') + }, { alias="sans-serif", variable=true, family="Sans Gurmukhi UI", lang={ "pa" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Hanifi Rohingya" }, { alias="sans-serif", variable=true, family="Sans Hatran" }, @@ -366,17 +366,17 @@ local subpackages = { { alias="sans-serif", variable=true, family="Sans Imperial Aramaic" }, { alias="sans-serif", variable=true, family="Sans Kannada", lang={ "kn" } }, { alias="sans-serif", variable=true, family="Sans Kannada UI", lang={ "kn" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Kayah Li" }, { alias="sans-serif", variable=true, family="Sans Khmer", lang={ "km" } }, { alias="sans-serif", variable=true, family="Sans Khmer UI", lang={ "km" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Lao", lang={ "lo" } }, { alias="sans-serif", variable=true, family="Sans Lao Looped", lang={ "lo" } }, { alias="sans-serif", variable=true, family="Sans Lao UI", lang={ "lo" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Linear A" }, { alias="sans-serif", variable=true, family="Sans Linear B" }, @@ -385,7 +385,7 @@ local subpackages = { { alias="sans-serif", variable=true, family="Sans Lydian" }, { alias="sans-serif", variable=true, family="Sans Malayalam", lang={ "ml" } }, { alias="sans-serif", variable=true, family="Sans Malayalam UI", lang={ "ml" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Mandaic" }, { alias="sans-serif", variable=true, family="Sans Marchen" }, @@ -400,7 +400,7 @@ local subpackages = { obsoletes={ "serif-myanmar-vf" } }, { alias="sans-serif", variable=true, family="Sans Myanmar UI", lang={ "my" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Nabataean" }, { alias="sans-serif", variable=true, family="Sans New Tai Lue", lang={ "khb" } }, @@ -414,7 +414,7 @@ local subpackages = { priority=rpm.expand('%{hprio}') }, { alias="sans-serif", variable=true, family="Sans Sinhala UI", lang={ "si" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Sora Sompeng" }, { alias="sans-serif", variable=true, family="Sans Soyombo" }, @@ -425,18 +425,18 @@ local subpackages = { { alias="sans-serif", variable=true, family="Sans Takri" }, { alias="sans-serif", variable=true, family="Sans Tamil", lang={ "ta" } }, { alias="sans-serif", variable=true, family="Sans Tamil Supplement", lang={ "ta" }, - excludeci=true + excludeci=true, nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Tamil UI", lang={ "ta" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Telugu", lang={ "te" } }, { alias="sans-serif", variable=true, family="Sans Telugu UI", lang={ "te" }, - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Thaana", lang={ "dv" } }, { alias="sans-serif", variable=true, family="Sans Thai", lang={ "th" } }, - { alias="sans-serif", variable=true, family="Sans Thai UI", lang={ "th" } }, + { alias="sans-serif", variable=true, family="Sans Thai UI", lang={ "th" }, nogroup=1 }, { alias="sans-serif", variable=true, family="Sans Ugaritic" }, { alias="sans-serif", variable=true, family="Sans Vai", lang={ "vai" } }, { alias="sans-serif", variable=true, family="Sans Wancho" }, @@ -449,7 +449,7 @@ local subpackages = { { alias="serif", variable=true, family="Serif Bengali", lang={ "bn" } }, { alias="serif", variable=true, family="Serif Devanagari", lang={ "bh", "bho", "brx", "doi", "hi", "hne", "kok", "ks@devanagari", "mai", "mr", "ne", "sa", "sat", "sd@devanagari" } }, { alias="serif", variable=true, family="Serif Display", - priority=rpm.expand('%{lprio}') + priority=rpm.expand('%{lprio}'), nogroup=1 }, { alias="serif", variable=true, family="Serif Ethiopic", lang={ "am", "byn", "gez", "sid", "ti-er", "ti-et", "tig", "wal" } }, { alias="serif", variable=true, family="Serif Georgian", lang={ "ka" } }, @@ -836,6 +836,7 @@ if f then f:write(_metainfobuild) f:close() end + rpm.define("notobuild_fcconf " .. _fcconfbuild .. "\n") rpm.define("notobuild_metainfo " .. _metainfobuild .. "\n") } ## end of lua @@ -850,6 +851,7 @@ exit 1 %endif %{notobuild_fcconf} + %install install -m 0755 -d %{buildroot}%{_fontbasedir}/google-noto for f in unhinted/ttf/*/Noto*.ttf hinted/ttf/*/Noto*.ttf; do @@ -891,6 +893,9 @@ done %changelog +* Tue Nov 16 2021 Akira TAGOH - 20201206-4 +- Have higher priority google-noto-sans-gurmukhi-vf-fonts than google-noto-sans-gurmukhi-fonts. + * Thu Jul 22 2021 Fedora Release Engineering - 20201206-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild