From b50ff340cc0a3eda93451d4d413837305cb3a389 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 31 Aug 2022 18:14:30 +0900
Subject: [PATCH] Drop lang="ar" for Kufi/Naskh Arabic fonts.

Adjust priority for Noto Thai fonts.
---
 google-noto-fonts.spec | 44 +++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec
index 94ff741..76e5fbd 100644
--- a/google-noto-fonts.spec
+++ b/google-noto-fonts.spec
@@ -15,14 +15,14 @@ in Unicode.\
 %global	vmprio	57
 %global mprio	58
 %global lprio	62
-%global	cjki_hprio	65-0
-%global	cjki_vmprio	65-2
-%global	cjki_mprio	66
-%global	cjki_lprio	67
+%global	nlat_hprio	65-0
+%global	nlat_vmprio	65-2
+%global	nlat_mprio	66
+%global	nlat_lprio	67
 
 Name:           %{fontname}-fonts
 Version:        20201206^1.git%{snapver}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Hinted and Non Hinted OpenType fonts for Unicode scripts
 License:        OFL
 URL:            https://github.com/googlefonts/noto-fonts/
@@ -54,7 +54,7 @@ group["serif"] = "Noto Serif"
 group["monospace"] = "Noto Sans Mono"
 
 local subpackages = {
-    { alias="cursive",    family="Kufi Arabic", lang={ "ar" } },
+    { alias="cursive",    family="Kufi Arabic" },
     { alias="cursive",    family="Nastaliq Urdu", lang={ "ur" } },
     { alias="cursive",    family="Rashi Hebrew", lang={ "he" } },
 
@@ -366,9 +366,9 @@ local subpackages = {
     },
     { alias="sans-serif", family="Sans Zanabazar Square" },
 
-    { alias="serif",      family="Naskh Arabic", lang={ "ar" },
+    { alias="serif",      family="Naskh Arabic",
       fcconfexfile=rpm.expand('%{SOURCE3}') },
-    { alias="serif",      family="Naskh Arabic UI", lang={ "ar" },
+    { alias="serif",      family="Naskh Arabic UI",
       priority=rpm.expand('%{lprio}')
     },
     { alias="serif",      family="Serif" },
@@ -416,7 +416,7 @@ local subpackages = {
     { alias="serif",      family="Serif Yezidi" },
     { alias="serif",      family="Traditional Nushu" },
 
-    { alias="cursive",    variable=true, family="Kufi Arabic", lang={ "ar" } },
+    { alias="cursive",    variable=true, family="Kufi Arabic" },
     { alias="cursive",    variable=true, family="Nastaliq Urdu", lang={ "ur" } },
     { alias="cursive",    variable=true, family="Rashi Hebrew", lang={ "he" } },
 
@@ -539,9 +539,9 @@ local subpackages = {
     { alias="sans-serif", variable=true, family="Sans Vithkuqi" },
     { alias="sans-serif", variable=true, family="Sans Zanabazar Square" },
 
-    { alias="serif",      variable=true, family="Naskh Arabic", lang={ "ar" },
+    { alias="serif",      variable=true, family="Naskh Arabic",
       fcconfexfile=rpm.expand('%{SOURCE3}') },
-    { alias="serif",      variable=true, family="Naskh Arabic UI", lang={ "ar" },
+    { alias="serif",      variable=true, family="Naskh Arabic UI",
       priority=rpm.expand('%{lprio}'), nogroup=1
     },
     { alias="serif",      variable=true, family="Serif",
@@ -582,12 +582,12 @@ local _metafilelist = ''
 local _fcconfbuild = ''
 local _metainfobuild = ''
 
-local function is_cjki(table)
-    cjki_langs = { "as", "bn", "brx", "doi", "gu", "hi", "ja", "kn", "ks@devanagari", "kok", "kr", "mai", "mr", "ne", "or", "sa", "sat", "sd@devanagari", "ta", "te", "zh-cn", "zh-hk", "zh-mo", "zh-sg", "zh-tw" }
+local function is_nonlatin(table)
+    nonlatin_langs = { "as", "bn", "brx", "doi", "gu", "hi", "ja", "kn", "ks@devanagari", "kok", "kr", "mai", "mr", "ne", "or", "sa", "sat", "sd@devanagari", "ta", "te", "th", "zh-cn", "zh-hk", "zh-mo", "zh-sg", "zh-tw" }
     if table.lang then
         for i = 1, #table.lang do
-            for j = 1, #cjki_langs do
-                if table.lang[i] == cjki_langs[j] then
+            for j = 1, #nonlatin_langs do
+                if table.lang[i] == nonlatin_langs[j] then
                     return true
                 end
             end
@@ -918,17 +918,17 @@ local function notopkg(table)
     local pkgname = rpm.expand('%{_fontname}-') .. pname .. '-fonts'
     local prio = (table.priority and table.priority or (table.variable and rpm.expand('%{hprio}') or rpm.expand('%{mprio}')))
 
-    if is_cjki(table) then
+    if is_nonlatin(table) then
         if prio == rpm.expand('%{hprio}') then
             if table.priority then
-                prio = rpm.expand('%{cjki_hprio}')
+                prio = rpm.expand('%{nlat_hprio}')
             else
-                prio = rpm.expand('%{cjki_vmprio}')
+                prio = rpm.expand('%{nlat_vmprio}')
             end
         elseif prio == rpm.expand('%{mprio}') then
-            prio = rpm.expand('%{cjki_mprio}')
+            prio = rpm.expand('%{nlat_mprio}')
         elseif prio == rpm.expand('%{lprio}') then
-            prio = rpm.expand('%{cjki_lprio}')
+            prio = rpm.expand('%{nlat_lprio}')
         else
             io.stderr:write("Unknown priority")
         end
@@ -1057,6 +1057,10 @@ done
 
 
 %changelog
+* Wed Aug 31 2022 Akira TAGOH <tagoh@redhat.com> - 20201206-1.git0c78c8329-3
+- Drop lang="ar" for Kufi/Naskh Arabic fonts.
+- Adjust priority for Noto Thai fonts.
+
 * Tue Aug  2 2022 Akira TAGOH <tagoh@redhat.com> - 20201206-1.git0c78c8329-2
 - Fix wrong alias for Noto Rashi Hebrew.
   Resolves: rhbz#2113077