Make Display and UI fonts lower priority.

google-noto-fonts.spec

@@ -7,6 +7,9 @@ in Unicode.\
 %{nil}
 
 %global commit 85e78f831469323c85847e23f95026c894159135
+%global hprio	65
+%global mprio	66
+%global lprio	67
 
 Name:           %{fontname}-fonts
 Version:        20181130
@@ -17,91 +20,91 @@ URL:            https://github.com/googlei18n/noto-fonts/
 # downloaded from https://github.com/googlei18n/noto-fonts/commits/85e78f831469323c85847e23f95026c894159135 -> download [zip]
 # link https://github.com/googlei18n/noto-fonts/archive/85e78f831469323c85847e23f95026c894159135.zip
 Source0:        noto-fonts-%{commit}.zip
-Source3:        66-%{fontconf}-sans-armenian.conf
-Source5:        66-%{fontconf}-sans-bengali.conf
-Source6:        66-%{fontconf}-sans-bengali-ui.conf
-Source9:        66-%{fontconf}-sans-cherokee.conf
-Source10:       66-%{fontconf}-sans-coptic.conf
-Source12:       66-%{fontconf}-sans-devanagari.conf
-Source13:       66-%{fontconf}-sans-devanagari-ui.conf
-Source15:       66-%{fontconf}-sans-ethiopic.conf
-Source16:       66-%{fontconf}-sans-georgian.conf
-Source18:       66-%{fontconf}-sans-hebrew.conf
-Source21:       66-%{fontconf}-sans-kannada.conf
-Source24:       66-%{fontconf}-sans-khmer.conf
-Source25:       66-%{fontconf}-sans-khmer-ui.conf
-Source26:       66-%{fontconf}-sans-lao.conf
-Source27:       66-%{fontconf}-sans-lao-ui.conf
-Source28:       66-%{fontconf}-sans-lisu.conf
-Source31:       66-%{fontconf}-sans-malayalam.conf
-Source32:       66-%{fontconf}-sans-malayalam-ui.conf
-Source34:       66-%{fontconf}-sans-meetei-mayek.conf
-Source35:       66-%{fontconf}-sans-nko.conf
-Source40:       66-%{fontconf}-sans-shavian.conf
-Source42:       66-%{fontconf}-sans-tagalog.conf
-Source44:       66-%{fontconf}-sans-tamil.conf
-Source45:       66-%{fontconf}-sans-tamil-ui.conf
-Source46:       66-%{fontconf}-sans-telugu.conf
-Source47:       66-%{fontconf}-sans-thai.conf
-Source48:       66-%{fontconf}-sans-thai-ui.conf
-Source51:       66-%{fontconf}-sans-vai.conf
-Source52:       66-%{fontconf}-serif-armenian.conf
-Source54:       66-%{fontconf}-serif-georgian.conf
-Source55:       66-%{fontconf}-serif-khmer.conf
-Source56:       66-%{fontconf}-serif-lao.conf
-Source57:       66-%{fontconf}-serif-thai.conf
-Source58:       66-%{fontconf}-sans-kannada-ui.conf
-Source59:       66-%{fontconf}-sans-telugu-ui.conf
-Source60:       66-%{fontconf}-sans-gujarati.conf
-Source61:       66-%{fontconf}-sans-gujarati-ui.conf
-Source62:       66-%{fontconf}-sans-hanunoo.conf
-Source64:       66-%{fontconf}-kufi-arabic.conf
-Source65:       66-%{fontconf}-naskh-arabic.conf
-Source66:       66-%{fontconf}-naskh-arabic-ui.conf
-Source67:       66-%{fontconf}-serif-balinese.conf
-Source68:       66-%{fontconf}-sans-bamum.conf
-Source69:       66-%{fontconf}-sans-batak.conf
-Source70:       66-%{fontconf}-sans-buginese.conf
-Source71:       66-%{fontconf}-sans-buhid.conf
-Source72:       66-%{fontconf}-sans-canadian-aboriginal.conf
-Source73:       66-%{fontconf}-sans-cham.conf
-Source74:       66-%{fontconf}-sans-cuneiform.conf
-Source75:       66-%{fontconf}-sans-cypriot.conf
-Source76:       66-%{fontconf}-sans-gothic.conf
-Source77:       66-%{fontconf}-sans-gurmukhi.conf
-Source78:       66-%{fontconf}-sans-gurmukhi-ui.conf
-Source81:       66-%{fontconf}-sans-javanese.conf
-Source82:       66-%{fontconf}-sans-lepcha.conf
-Source83:       66-%{fontconf}-sans-limbu.conf
-Source85:       66-%{fontconf}-sans-mongolian.conf
-Source86:       66-%{fontconf}-sans-myanmar.conf
-Source87:       66-%{fontconf}-sans-myanmar-ui.conf
-Source88:       66-%{fontconf}-sans-new-tai-lue.conf
-Source89:       66-%{fontconf}-sans-ogham.conf
-Source90:       66-%{fontconf}-sans-ol-chiki.conf
-Source94:       66-%{fontconf}-sans-rejang.conf
-Source95:       66-%{fontconf}-sans-runic.conf
-Source97:       66-%{fontconf}-sans-saurashtra.conf
-Source98:       65-%{fontconf}-sans-sinhala.conf
-Source99:       66-%{fontconf}-sans-sundanese.conf
-Source101:      66-%{fontconf}-sans-syriac-eastern.conf
-Source102:      66-%{fontconf}-sans-syriac-estrangela.conf
-Source103:      66-%{fontconf}-sans-syriac-western.conf
-Source105:      66-%{fontconf}-sans-tifinagh.conf
-Source107:      66-%{fontconf}-sans-tagbanwa.conf
-Source108:      66-%{fontconf}-sans-thaana.conf
+Source3:        %{mprio}-%{fontconf}-sans-armenian.conf
+Source5:        %{mprio}-%{fontconf}-sans-bengali.conf
+Source6:        %{lprio}-%{fontconf}-sans-bengali-ui.conf
+Source9:        %{mprio}-%{fontconf}-sans-cherokee.conf
+Source10:       %{mprio}-%{fontconf}-sans-coptic.conf
+Source12:       %{mprio}-%{fontconf}-sans-devanagari.conf
+Source13:       %{lprio}-%{fontconf}-sans-devanagari-ui.conf
+Source15:       %{mprio}-%{fontconf}-sans-ethiopic.conf
+Source16:       %{mprio}-%{fontconf}-sans-georgian.conf
+Source18:       %{mprio}-%{fontconf}-sans-hebrew.conf
+Source21:       %{mprio}-%{fontconf}-sans-kannada.conf
+Source24:       %{mprio}-%{fontconf}-sans-khmer.conf
+Source25:       %{lprio}-%{fontconf}-sans-khmer-ui.conf
+Source26:       %{mprio}-%{fontconf}-sans-lao.conf
+Source27:       %{lprio}-%{fontconf}-sans-lao-ui.conf
+Source28:       %{mprio}-%{fontconf}-sans-lisu.conf
+Source31:       %{mprio}-%{fontconf}-sans-malayalam.conf
+Source32:       %{lprio}-%{fontconf}-sans-malayalam-ui.conf
+Source34:       %{mprio}-%{fontconf}-sans-meetei-mayek.conf
+Source35:       %{mprio}-%{fontconf}-sans-nko.conf
+Source40:       %{mprio}-%{fontconf}-sans-shavian.conf
+Source42:       %{mprio}-%{fontconf}-sans-tagalog.conf
+Source44:       %{mprio}-%{fontconf}-sans-tamil.conf
+Source45:       %{lprio}-%{fontconf}-sans-tamil-ui.conf
+Source46:       %{mprio}-%{fontconf}-sans-telugu.conf
+Source47:       %{mprio}-%{fontconf}-sans-thai.conf
+Source48:       %{lprio}-%{fontconf}-sans-thai-ui.conf
+Source51:       %{mprio}-%{fontconf}-sans-vai.conf
+Source52:       %{mprio}-%{fontconf}-serif-armenian.conf
+Source54:       %{mprio}-%{fontconf}-serif-georgian.conf
+Source55:       %{mprio}-%{fontconf}-serif-khmer.conf
+Source56:       %{mprio}-%{fontconf}-serif-lao.conf
+Source57:       %{mprio}-%{fontconf}-serif-thai.conf
+Source58:       %{lprio}-%{fontconf}-sans-kannada-ui.conf
+Source59:       %{lprio}-%{fontconf}-sans-telugu-ui.conf
+Source60:       %{mprio}-%{fontconf}-sans-gujarati.conf
+Source61:       %{lprio}-%{fontconf}-sans-gujarati-ui.conf
+Source62:       %{mprio}-%{fontconf}-sans-hanunoo.conf
+Source64:       %{mprio}-%{fontconf}-kufi-arabic.conf
+Source65:       %{mprio}-%{fontconf}-naskh-arabic.conf
+Source66:       %{lprio}-%{fontconf}-naskh-arabic-ui.conf
+Source67:       %{mprio}-%{fontconf}-serif-balinese.conf
+Source68:       %{mprio}-%{fontconf}-sans-bamum.conf
+Source69:       %{mprio}-%{fontconf}-sans-batak.conf
+Source70:       %{mprio}-%{fontconf}-sans-buginese.conf
+Source71:       %{mprio}-%{fontconf}-sans-buhid.conf
+Source72:       %{mprio}-%{fontconf}-sans-canadian-aboriginal.conf
+Source73:       %{mprio}-%{fontconf}-sans-cham.conf
+Source74:       %{mprio}-%{fontconf}-sans-cuneiform.conf
+Source75:       %{mprio}-%{fontconf}-sans-cypriot.conf
+Source76:       %{mprio}-%{fontconf}-sans-gothic.conf
+Source77:       %{mprio}-%{fontconf}-sans-gurmukhi.conf
+Source78:       %{lprio}-%{fontconf}-sans-gurmukhi-ui.conf
+Source81:       %{mprio}-%{fontconf}-sans-javanese.conf
+Source82:       %{mprio}-%{fontconf}-sans-lepcha.conf
+Source83:       %{mprio}-%{fontconf}-sans-limbu.conf
+Source85:       %{mprio}-%{fontconf}-sans-mongolian.conf
+Source86:       %{mprio}-%{fontconf}-sans-myanmar.conf
+Source87:       %{lprio}-%{fontconf}-sans-myanmar-ui.conf
+Source88:       %{mprio}-%{fontconf}-sans-new-tai-lue.conf
+Source89:       %{mprio}-%{fontconf}-sans-ogham.conf
+Source90:       %{mprio}-%{fontconf}-sans-ol-chiki.conf
+Source94:       %{mprio}-%{fontconf}-sans-rejang.conf
+Source95:       %{mprio}-%{fontconf}-sans-runic.conf
+Source97:       %{mprio}-%{fontconf}-sans-saurashtra.conf
+Source98:       %{hprio}-%{fontconf}-sans-sinhala.conf
+Source99:       %{mprio}-%{fontconf}-sans-sundanese.conf
+Source101:      %{mprio}-%{fontconf}-sans-syriac-eastern.conf
+Source102:      %{mprio}-%{fontconf}-sans-syriac-estrangela.conf
+Source103:      %{mprio}-%{fontconf}-sans-syriac-western.conf
+Source105:      %{mprio}-%{fontconf}-sans-tifinagh.conf
+Source107:      %{mprio}-%{fontconf}-sans-tagbanwa.conf
+Source108:      %{mprio}-%{fontconf}-sans-thaana.conf
 
-Source156:      66-%{fontconf}-sans-oriya.conf
-Source157:      66-%{fontconf}-sans-oriya-ui.conf
-Source158:      66-%{fontconf}-nastaliq-urdu.conf
-Source159:      66-%{fontconf}-sans-tibetan.conf
-Source161:      66-%{fontconf}-serif-bengali.conf
-Source162:      66-%{fontconf}-serif-devanagari.conf
-Source163:      66-%{fontconf}-serif-gujarati.conf
-Source164:      66-%{fontconf}-serif-kannada.conf
-Source165:      66-%{fontconf}-serif-malayalam.conf
-Source166:      66-%{fontconf}-serif-tamil.conf
-Source167:      66-%{fontconf}-serif-telugu.conf
+Source156:      %{mprio}-%{fontconf}-sans-oriya.conf
+Source157:      %{lprio}-%{fontconf}-sans-oriya-ui.conf
+Source158:      %{mprio}-%{fontconf}-nastaliq-urdu.conf
+Source159:      %{mprio}-%{fontconf}-sans-tibetan.conf
+Source161:      %{mprio}-%{fontconf}-serif-bengali.conf
+Source162:      %{mprio}-%{fontconf}-serif-devanagari.conf
+Source163:      %{mprio}-%{fontconf}-serif-gujarati.conf
+Source164:      %{mprio}-%{fontconf}-serif-kannada.conf
+Source165:      %{mprio}-%{fontconf}-serif-malayalam.conf
+Source166:      %{mprio}-%{fontconf}-serif-tamil.conf
+Source167:      %{mprio}-%{fontconf}-serif-telugu.conf
 
 # Add appstream metadata files
 Source200:      %{fontname}.metainfo.xml
@@ -129,7 +132,7 @@ Common files for Google Noto fonts.
 %define pname %(echo %{*} | tr "A-Z " "a-z-")\
 %{!-a:%define fname %(echo %{*} | sed -e "s/ //g")}\
 %define subpkg %{fontname}-%{pname}\
-%define fconf %{-p*}%{!-p:66}-%{fontconf}-%{pname}.conf\
+%define fconf %{-p*}%{!-p:%{mprio}}-%{fontconf}-%{pname}.conf\
 %package -n %{subpkg}-fonts\
 Summary:        %{*} font\
 Requires:       fontpackages-filesystem\
@@ -146,21 +149,21 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Kufi Arabic
 %notopkg Music
 %notopkg Naskh Arabic
-%notopkg Naskh Arabic UI
+%notopkg -p %{lprio} Naskh Arabic UI
 %notopkg Sans
-%notopkg -o sans-ui Sans Display
+%notopkg -p %{lprio} -o sans-ui Sans Display
 %notopkg Sans Adlam
 %notopkg Sans Adlam Unjoined
 %notopkg Sans Anatolian Hieroglyphs
 %notopkg Sans Arabic
-%notopkg Sans Arabic UI
+%notopkg -p %{lprio} Sans Arabic UI
 %notopkg Sans Armenian
 %notopkg Sans Avestan
 %notopkg Sans Bamum
 %notopkg Sans Bassa Vah
 %notopkg Sans Batak
 %notopkg Sans Bengali
-%notopkg Sans Bengali UI
+%notopkg -p %{lprio} Sans Bengali UI
 %notopkg Sans Bhaiksuki
 %notopkg Sans Brahmi
 %notopkg Sans Buginese
@@ -176,7 +179,7 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Sans Cypriot
 %notopkg Sans Deseret
 %notopkg Sans Devanagari
-%notopkg Sans Devanagari UI
+%notopkg -p %{lprio} Sans Devanagari UI
 %notopkg Sans Duployan
 %notopkg Sans Egyptian Hieroglyphs
 %notopkg Sans Elbasan
@@ -186,9 +189,9 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Sans Gothic
 %notopkg Sans Grantha
 %notopkg Sans Gujarati
-%notopkg Sans Gujarati UI
+%notopkg -p %{lprio} Sans Gujarati UI
 %notopkg Sans Gurmukhi
-%notopkg Sans Gurmukhi UI
+%notopkg -p %{lprio} Sans Gurmukhi UI
 %notopkg -o sans-hanunno Sans Hanunoo
 %notopkg Sans Hatran
 %notopkg Sans Hebrew
@@ -198,15 +201,15 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Sans Javanese
 %notopkg Sans Kaithi
 %notopkg Sans Kannada
-%notopkg Sans Kannada UI
+%notopkg -p %{lprio} Sans Kannada UI
 %notopkg Sans Kayah Li
 %notopkg Sans Kharoshthi
 %notopkg Sans Khmer
-%notopkg Sans Khmer UI
+%notopkg -p %{lprio} Sans Khmer UI
 %notopkg Sans Khojki
 %notopkg Sans Khudawadi
 %notopkg Sans Lao
-%notopkg Sans Lao UI
+%notopkg -p %{lprio} Sans Lao UI
 %notopkg Sans Lepcha
 %notopkg Sans Limbu
 %notopkg Sans Linear A
@@ -216,7 +219,7 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Sans Lydian
 %notopkg Sans Mahajani
 %notopkg Sans Malayalam
-%notopkg Sans Malayalam UI
+%notopkg -p %{lprio} Sans Malayalam UI
 %notopkg Sans Mandaic
 %notopkg Sans Manichaean
 %notopkg Sans Marchen
@@ -229,7 +232,7 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Sans Mro
 %notopkg Sans Multani
 %notopkg Sans Myanmar
-%notopkg Sans Myanmar UI
+%notopkg -p %{lprio} Sans Myanmar UI
 %notopkg Sans Nabataean
 %notopkg Sans New Tai Lue
 %notopkg Sans Newa
@@ -257,8 +260,8 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Sans Saurashtra
 %notopkg Sans Sharada
 %notopkg Sans Shavian
-%notopkg -p 65 Sans Sinhala
-%notopkg Sans Sinhala UI
+%notopkg -p %{hprio} Sans Sinhala
+%notopkg -p %{lprio} Sans Sinhala UI
 %notopkg Sans Sora Sompeng
 %notopkg Sans Sundanese
 %notopkg Sans Syloti Nagri
@@ -275,12 +278,12 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Sans Tai Tham
 %notopkg Sans Tai Viet
 %notopkg Sans Tamil
-%notopkg Sans Tamil UI
+%notopkg -p %{lprio} Sans Tamil UI
 %notopkg Sans Telugu
-%notopkg Sans Telugu UI
+%notopkg -p %{lprio} Sans Telugu UI
 %notopkg Sans Thaana
 %notopkg Sans Thai
-%notopkg Sans Thai UI
+%notopkg -p %{lprio} Sans Thai UI
 %notopkg Sans Tifinagh
 %notopkg Sans Tirhuta
 %notopkg Sans Ugaritic
@@ -291,7 +294,7 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Serif Ahom
 %notopkg Serif Armenian
 %notopkg -o sans-balinese Serif Balinese
-%notopkg Serif Display
+%notopkg -p %{lprio} Serif Display
 %notopkg Serif Ethiopic
 %notopkg Serif Georgian
 %notopkg Serif Hebrew
@@ -301,7 +304,7 @@ Noto %1 font%{?2: for %(echo %* | sed -e "s/%1 //")}.\
 %notopkg Serif Tamil Slanted
 %notopkg Serif Thai
 %notopkg Sans Oriya
-%notopkg Sans Oriya UI
+%notopkg -p %{lprio} Sans Oriya UI
 %notopkg Sans Tibetan
 %notopkg Nastaliq Urdu
 %notopkg -o mono Sans Mono
@@ -339,7 +342,7 @@ install -Dm 0644 -p %{SOURCE200} \
 
 %define fcconfbuild(a:g:p:)\
 %define pname %(echo %{*} | tr "A-Z " "a-z-")\
-%define fconf %{-p*}%{!-p:66}-%{fontconf}-%{pname}.conf\
+%define fconf %{-p*}%{!-p:%{mprio}}-%{fontconf}-%{pname}.conf\
 cat<<_EOL_>%{buildroot}%{_fontconfig_templatedir}/%{fconf}\
 <?xml version=\"1.0\" encoding=\"UTF-8\"?>\
 <!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">\
@@ -364,7 +367,7 @@ _EOL_
 %fcconfbuild -g sans-serif Sans Adlam Unjoined
 %fcconfbuild -g sans-serif Sans Anatolian Hieroglyphs
 %fcconfbuild -g sans-serif Sans Arabic
-%fcconfbuild -g sans-serif Sans Arabic UI
+%fcconfbuild -p %{lprio} -g sans-serif Sans Arabic UI
 %fcconfbuild -g sans-serif Sans Avestan
 %fcconfbuild -g sans-serif Sans Bassa Vah
 %fcconfbuild -g sans-serif Sans Bhaiksuki
@@ -373,7 +376,7 @@ _EOL_
 %fcconfbuild -g sans-serif Sans Caucasian Albanian
 %fcconfbuild -g sans-serif Sans Chakma
 %fcconfbuild -g sans-serif Sans Deseret
-%fcconfbuild -g sans-serif Sans Display
+%fcconfbuild -p %{lprio} -g sans-serif Sans Display
 %fcconfbuild -g sans-serif Sans Duployan
 %fcconfbuild -g sans-serif Sans Egyptian Hieroglyphs
 %fcconfbuild -g sans-serif Sans Elbasan
@@ -422,7 +425,7 @@ _EOL_
 %fcconfbuild -g sans-serif Sans Psalter Pahlavi
 %fcconfbuild -g sans-serif Sans Samaritan
 %fcconfbuild -g sans-serif Sans Sharada
-%fcconfbuild -g sans-serif Sans Sinhala UI
+%fcconfbuild -p %{lprio} -g sans-serif Sans Sinhala UI
 %fcconfbuild -g sans-serif Sans Sora Sompeng
 %fcconfbuild -g sans-serif Sans Syloti Nagri
 %fcconfbuild -g fantasy Sans Symbols
@@ -438,7 +441,7 @@ _EOL_
 %fcconfbuild -g sans-serif Sans Yi
 %fcconfbuild -g sans-serif Sans
 %fcconfbuild -g serif Serif Ahom
-%fcconfbuild -g serif Serif Display
+%fcconfbuild -p %{lprio} -g serif Serif Display
 %fcconfbuild -g serif Serif Ethiopic
 %fcconfbuild -g serif Serif Gurmukhi
 %fcconfbuild -g serif Serif Hebrew
@@ -528,6 +531,9 @@ done
 
 
 %changelog
+* Mon Dec 17 2018 Akira TAGOH <tagoh@redhat.com> - 20181130-2
+- Make Display and UI fonts lower priority.
+
 * Fri Dec  7 2018 Akira TAGOH <tagoh@redhat.com> - 20181130-1
 - Updates to 20181130.
 - Noto Sans Balinese is now Noto Serif Balinese.