From 51fdcd214c30235def77714a35d4da147ca176e4 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Mon, 29 Oct 2007 09:13:55 +0000
Subject: [PATCH] [fonts] install dejavu-fonts by default instead of
 dejavu-lgc-fonts [arabic] replace fonts-arabic by dejavu-fonts, kacst-fonts
 and paktype-fonts [hebrew] replace fonts-hebrew by dejavu-fonts and
 culmus-fonts [indic] replace fonts-* by lohit-fonts-* [japanese] list
 sazanami-fonts [korean] replace fonts-korean by baekmuk-*-fonts* [sinhala]
 replace fonts-sinhala by lklug-fonts [urdu] replace fonts-arabic by
 paktype-fonts, kactype-fonts and dejavu-fonts

---
 comps-f9.xml.in | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/comps-f9.xml.in b/comps-f9.xml.in
index a7aa562f..99e29109 100644
--- a/comps-f9.xml.in
+++ b/comps-f9.xml.in
@@ -66,13 +66,14 @@
     <uservisible>false</uservisible>
     <langonly>ar</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-arabic</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ar</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-ar</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Arabic</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ar</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
-      <packagereq type="optional">dejavu-fonts</packagereq>
+      <packagereq type="default">dejavu-fonts</packagereq>
+      <packagereq type="default">kacst-fonts</packagereq>
+      <packagereq type="default">paktype-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">m17n-db-arabic</packagereq>
       <packagereq type="optional">scim-tables-arabic</packagereq>
@@ -99,7 +100,7 @@
     <uservisible>false</uservisible>
     <langonly>as</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-bengali</packagereq>
+      <packagereq type="mandatory">lohit-fonts-bengali</packagereq>
       <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
@@ -364,7 +365,7 @@
     <packagelist>
       <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
-      <packagereq type="default">dejavu-lgc-fonts</packagereq>
+      <packagereq type="default">dejavu-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">kacst-fonts</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
@@ -386,8 +387,8 @@
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
-      <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
+      <packagereq type="optional">dejavu-lgc-fonts</packagereq>
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">fonts-arabic</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
@@ -2023,14 +2024,14 @@
     <uservisible>false</uservisible>
     <langonly>he</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-hebrew</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-he</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-he</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hebrew</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-he</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-he_IL</packagereq>
       <packagereq type="conditional" requires="tetex">tetex-fonts-hebrew</packagereq>
-      <packagereq type="optional">dejavu-fonts</packagereq>
+      <packagereq type="default">dejavu-fonts</packagereq>
+      <packagereq type="default">culmus-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>
       <packagereq type="optional">m17n-db-hebrew</packagereq>
@@ -2044,7 +2045,7 @@
     <uservisible>false</uservisible>
     <langonly>hi</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-hindi</packagereq>
+      <packagereq type="mandatory">lohit-fonts-hindi</packagereq>
       <packagereq type="mandatory">m17n-contrib-hindi</packagereq>
       <packagereq type="mandatory">m17n-db-hindi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
@@ -2155,7 +2156,6 @@
     <uservisible>false</uservisible>
     <langonly>ja</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-japanese</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Japanese</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ja</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-ja</packagereq>
@@ -2163,6 +2163,9 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-japanese</packagereq>
+      <packagereq type="default">fonts-japanese</packagereq>
+      <packagereq type="default">sazanami-fonts-gothic</packagereq>
+      <packagereq type="default">sazanami-fonts-mincho</packagereq>
       <packagereq type="default">VLGothic-fonts</packagereq>
       <packagereq type="optional">anthy-el</packagereq>
       <packagereq type="optional">cmigemo</packagereq>
@@ -2337,7 +2340,7 @@
     <uservisible>false</uservisible>
     <langonly>kn</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-kannada</packagereq>
+      <packagereq type="mandatory">lohit-fonts-kannada</packagereq>
       <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
@@ -2483,13 +2486,17 @@
     <uservisible>false</uservisible>
     <langonly>ko</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-korean</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Korean</packagereq>
       <packagereq type="conditional" requires="man-pages">man-pages-ko</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ko</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ko_KR</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-hangul</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-korean</packagereq>
+      <packagereq type="default">baekmuk-bdf-fonts</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-batang</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-dotum</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-hline</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-korean</packagereq>
       <packagereq type="optional">nabi</packagereq>
@@ -2652,7 +2659,7 @@
     <uservisible>false</uservisible>
     <langonly>ml</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-malayalam</packagereq>
+      <packagereq type="mandatory">lohit-fonts-malayalam</packagereq>
       <packagereq type="mandatory">m17n-contrib-malayalam</packagereq>
       <packagereq type="mandatory">m17n-db-malayalam</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ml</packagereq>
@@ -2680,7 +2687,7 @@
     <uservisible>false</uservisible>
     <langonly>mr</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-hindi</packagereq>
+      <packagereq type="mandatory">lohit-fonts-hindi</packagereq>
       <packagereq type="mandatory">m17n-contrib-marathi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-mr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>
@@ -2728,7 +2735,7 @@
     <uservisible>false</uservisible>
     <langonly>ne</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-hindi</packagereq>
+      <packagereq type="mandatory">lohit-fonts-hindi</packagereq>
       <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-ne</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-nepali</packagereq>
@@ -2903,7 +2910,7 @@
     <uservisible>false</uservisible>
     <langonly>or</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-oriya</packagereq>
+      <packagereq type="mandatory">lohit-fonts-oriya</packagereq>
       <packagereq type="mandatory">m17n-contrib-oriya</packagereq>
       <packagereq type="mandatory">m17n-db-oriya</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
@@ -2991,7 +2998,7 @@
     <uservisible>false</uservisible>
     <langonly>pa</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-punjabi</packagereq>
+      <packagereq type="mandatory">lohit-fonts-punjabi</packagereq>
       <packagereq type="mandatory">m17n-contrib-punjabi</packagereq>
       <packagereq type="mandatory">m17n-db-punjabi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-pa</packagereq>
@@ -3114,7 +3121,7 @@
     <uservisible>false</uservisible>
     <langonly>si</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-sinhala</packagereq>
+      <packagereq type="mandatory">lklug-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-si</packagereq>
@@ -3582,7 +3589,7 @@
     <uservisible>false</uservisible>
     <langonly>ta</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-tamil</packagereq>
+      <packagereq type="mandatory">lohit-fonts-tamil</packagereq>
       <packagereq type="mandatory">m17n-contrib-tamil</packagereq>
       <packagereq type="mandatory">m17n-db-tamil</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ta</packagereq>
@@ -3600,7 +3607,7 @@
     <uservisible>false</uservisible>
     <langonly>te</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-telugu</packagereq>
+      <packagereq type="mandatory">lohit-fonts-telugu</packagereq>
       <packagereq type="mandatory">m17n-contrib-telugu</packagereq>
       <packagereq type="mandatory">m17n-db-telugu</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-te</packagereq>
@@ -3758,9 +3765,11 @@
     <uservisible>false</uservisible>
     <langonly>ur</langonly>
     <packagelist>
-      <packagereq type="mandatory">fonts-arabic</packagereq>
+      <packagereq type="mandatory">paktype-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-urdu</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
+      <packagereq type="default">dejavu-fonts</packagereq>
+      <packagereq type="default">kacst-fonts</packagereq>
     </packagelist>
   </group>
   <group>