2 commits - comps-f16.xml.in comps-f17.xml.in

[Bill Nottingham]

 comps-f16.xml.in |    6 +++---
 comps-f17.xml.in |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9c932c3ba3baa2fab77d6518e5f48dffb25de52b
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Sep 23 14:46:03 2011 -0400

    port prior commit to f17

diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 0239a54..4bf66fe 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -1831,6 +1831,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
@@ -1859,7 +1860,7 @@
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
-      <packagereq type="default">wqy-zenhei-fonts</packagereq>
+      <packagereq type="default">wqy-microhei-fonts</packagereq>
       <packagereq type="optional">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-3-fonts</packagereq>
@@ -1906,7 +1907,6 @@
       <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
-      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">conakry-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
@@ -2123,7 +2123,7 @@
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-shadow-fonts</packagereq>
-      <packagereq type="optional">wqy-microhei-fonts</packagereq>
+      <packagereq type="optional">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">yanone-kaffeesatz-fonts</packagereq>
       <packagereq type="optional">yanone-tagesschrift-fonts</packagereq>


commit 617b79bb78feb7171a6ac27651ec7520c9083a7d
Author: Peng Wu <alexepico at gmail.com>
Date:   Fri Sep 23 10:40:22 2011 +0800

    improve Chinese fonts (#740454)

diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index 8f109c4..531116e 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -1966,6 +1966,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
@@ -1994,7 +1995,7 @@
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
-      <packagereq type="default">wqy-microhei-fonts</packagereq>
+      <packagereq type="default">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-3-fonts</packagereq>
@@ -2041,7 +2042,6 @@
       <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
-      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">conakry-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
@@ -2258,7 +2258,7 @@
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-shadow-fonts</packagereq>
-      <packagereq type="optional">wqy-zenhei-fonts</packagereq>
+      <packagereq type="optional">wqy-microhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">yanone-kaffeesatz-fonts</packagereq>
       <packagereq type="optional">yanone-tagesschrift-fonts</packagereq>