From b03ea2694e8c913f75e9c8eaabedc66217651f18 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 29 Sep 2010 12:57:24 -0400
Subject: [PATCH] Fix some fonts that got renamed.

---
 comps-f14.xml.in | 50 ++++++++++++++++++++++++------------------------
 comps-f15.xml.in | 50 ++++++++++++++++++++++++------------------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index 3f75e470..47794baf 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -2215,18 +2215,18 @@
       <packagereq type="optional">un-core-graphic-fonts</packagereq>
       <packagereq type="optional">un-core-gungseo-fonts</packagereq>
       <packagereq type="optional">un-core-pilgi-fonts</packagereq>
-      <packagereq type="optional">un-extra-fonts-bom</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamodotum</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamonovel</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamosora</packagereq>
-      <packagereq type="optional">un-extra-fonts-pen</packagereq>
-      <packagereq type="optional">un-extra-fonts-penheulim</packagereq>
-      <packagereq type="optional">un-extra-fonts-pilgia</packagereq>
-      <packagereq type="optional">un-extra-fonts-shinmun</packagereq>
-      <packagereq type="optional">un-extra-fonts-taza</packagereq>
-      <packagereq type="optional">un-extra-fonts-vada</packagereq>
-      <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
+      <packagereq type="optional">un-extra-bom-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamobatang-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamodotum-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamonovel-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamosora-fonts</packagereq>
+      <packagereq type="optional">un-extra-pen-fonts</packagereq>
+      <packagereq type="optional">un-extra-penheulim-fonts</packagereq>
+      <packagereq type="optional">un-extra-pilgia-fonts</packagereq>
+      <packagereq type="optional">un-extra-shinmun-fonts</packagereq>
+      <packagereq type="optional">un-extra-taza-fonts</packagereq>
+      <packagereq type="optional">un-extra-vada-fonts</packagereq>
+      <packagereq type="optional">un-extra-yetgul-fonts</packagereq>
       <packagereq type="optional">vemana2000-fonts</packagereq>
       <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">vollkorn-fonts</packagereq>
@@ -4057,18 +4057,18 @@
       <packagereq type="optional">baekmuk-ttf-hline-fonts</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">nabi</packagereq>
-      <packagereq type="optional">un-extra-fonts-bom</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamodotum</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamonovel</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamosora</packagereq>
-      <packagereq type="optional">un-extra-fonts-pen</packagereq>
-      <packagereq type="optional">un-extra-fonts-penheulim</packagereq>
-      <packagereq type="optional">un-extra-fonts-pilgia</packagereq>
-      <packagereq type="optional">un-extra-fonts-shinmun</packagereq>
-      <packagereq type="optional">un-extra-fonts-taza</packagereq>
-      <packagereq type="optional">un-extra-fonts-vada</packagereq>
-      <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
+      <packagereq type="optional">un-extra-bom-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamobatang-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamodotum-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamonovel-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamosora-fonts</packagereq>
+      <packagereq type="optional">un-extra-pen-fonts</packagereq>
+      <packagereq type="optional">un-extra-penheulim-fonts</packagereq>
+      <packagereq type="optional">un-extra-pilgia-fonts</packagereq>
+      <packagereq type="optional">un-extra-shinmun-fonts</packagereq>
+      <packagereq type="optional">un-extra-taza-fonts</packagereq>
+      <packagereq type="optional">un-extra-vada-fonts</packagereq>
+      <packagereq type="optional">un-extra-yetgul-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5072,7 +5072,7 @@
     <uservisible>true</uservisible>
     <langonly>ro</langonly>
     <packagelist>
-      <packagereq type="mandatory">terminus-console-fonts</packagereq>
+      <packagereq type="mandatory">terminus-fonts-console</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ro</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ro</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-ro</packagereq>
diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index f7b9c64a..45a8e517 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -2210,18 +2210,18 @@
       <packagereq type="optional">un-core-graphic-fonts</packagereq>
       <packagereq type="optional">un-core-gungseo-fonts</packagereq>
       <packagereq type="optional">un-core-pilgi-fonts</packagereq>
-      <packagereq type="optional">un-extra-fonts-bom</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamodotum</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamonovel</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamosora</packagereq>
-      <packagereq type="optional">un-extra-fonts-pen</packagereq>
-      <packagereq type="optional">un-extra-fonts-penheulim</packagereq>
-      <packagereq type="optional">un-extra-fonts-pilgia</packagereq>
-      <packagereq type="optional">un-extra-fonts-shinmun</packagereq>
-      <packagereq type="optional">un-extra-fonts-taza</packagereq>
-      <packagereq type="optional">un-extra-fonts-vada</packagereq>
-      <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
+      <packagereq type="optional">un-extra-bom-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamobatang-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamodotum-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamonovel-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamosora-fonts</packagereq>
+      <packagereq type="optional">un-extra-pen-fonts</packagereq>
+      <packagereq type="optional">un-extra-penheulim-fonts</packagereq>
+      <packagereq type="optional">un-extra-pilgia-fonts</packagereq>
+      <packagereq type="optional">un-extra-shinmun-fonts</packagereq>
+      <packagereq type="optional">un-extra-taza-fonts</packagereq>
+      <packagereq type="optional">un-extra-vada-fonts</packagereq>
+      <packagereq type="optional">un-extra-yetgul-fonts</packagereq>
       <packagereq type="optional">vemana2000-fonts</packagereq>
       <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">vollkorn-fonts</packagereq>
@@ -4051,18 +4051,18 @@
       <packagereq type="optional">baekmuk-ttf-hline-fonts</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">nabi</packagereq>
-      <packagereq type="optional">un-extra-fonts-bom</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamobatang</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamodotum</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamonovel</packagereq>
-      <packagereq type="optional">un-extra-fonts-jamosora</packagereq>
-      <packagereq type="optional">un-extra-fonts-pen</packagereq>
-      <packagereq type="optional">un-extra-fonts-penheulim</packagereq>
-      <packagereq type="optional">un-extra-fonts-pilgia</packagereq>
-      <packagereq type="optional">un-extra-fonts-shinmun</packagereq>
-      <packagereq type="optional">un-extra-fonts-taza</packagereq>
-      <packagereq type="optional">un-extra-fonts-vada</packagereq>
-      <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
+      <packagereq type="optional">un-extra-bom-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamobatang-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamodotum-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamonovel-fonts</packagereq>
+      <packagereq type="optional">un-extra-jamosora-fonts</packagereq>
+      <packagereq type="optional">un-extra-pen-fonts</packagereq>
+      <packagereq type="optional">un-extra-penheulim-fonts</packagereq>
+      <packagereq type="optional">un-extra-pilgia-fonts</packagereq>
+      <packagereq type="optional">un-extra-shinmun-fonts</packagereq>
+      <packagereq type="optional">un-extra-taza-fonts</packagereq>
+      <packagereq type="optional">un-extra-vada-fonts</packagereq>
+      <packagereq type="optional">un-extra-yetgul-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5066,7 +5066,7 @@
     <uservisible>true</uservisible>
     <langonly>ro</langonly>
     <packagelist>
-      <packagereq type="mandatory">terminus-console-fonts</packagereq>
+      <packagereq type="mandatory">terminus-fonts-console</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ro</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ro</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-ro</packagereq>