From 55529535ef9e271975f1a02e69854840f851a06a Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Wed, 18 Nov 2009 07:30:08 +0000
Subject: [PATCH] sync with comps-f12: - bitmap-fonts -
 fedora-security-guide-en-US - ibus-table* - ipa-*-fonts and vlgothic*-fonts -
 lohit-*-fonts - haskell-platform & ghc-* - gtk2-immodule-xim - ibus-qt -
 hunspell-kn - m17n-* - saab-fonts - sugar-* - serafettin-cartoon-fonts -
 pothana2000-fonts and vemana2000-fonts

add content category
---
 comps-f13.xml.in | 101 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 79 insertions(+), 22 deletions(-)

diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index 870680bc..ff1fcef6 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -354,7 +354,6 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
-      <packagereq type="default">bitmap-fonts</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">desktop-backgrounds-basic</packagereq>
       <packagereq type="default">firstboot</packagereq>
@@ -375,6 +374,7 @@
       <packagereq type="default">xorg-x11-utils</packagereq>
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
+      <packagereq type="optional">bitmap-fonts</packagereq>
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">gdm</packagereq>
       <packagereq type="optional">gxmessage</packagereq>
@@ -485,6 +485,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">diveintopython</packagereq>
+      <packagereq type="default">fedora-security-guide-en-US</packagereq>
       <packagereq type="default">javanotes</packagereq>
       <packagereq type="default">ldd-pdf</packagereq>
     </packagelist>
@@ -665,7 +666,6 @@
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh_TW</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-chewing</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-pinyin</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-table-chinese</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Chinese</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Chinese-Big5</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Chinese</packagereq>
@@ -678,9 +678,14 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zh_TW</packagereq>
       <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="optional">gcin</packagereq>
+      <packagereq type="optional">ibus-table-array30</packagereq>
       <packagereq type="optional">ibus-table-cangjie</packagereq>
       <packagereq type="optional">ibus-table-erbi</packagereq>
+      <packagereq type="optional">ibus-table-extraphrase</packagereq>
+      <packagereq type="optional">ibus-table-quick</packagereq>
       <packagereq type="optional">ibus-table-wubi</packagereq>
+      <packagereq type="optional">ibus-table-xinhua</packagereq>
+      <packagereq type="optional">ibus-table-yong</packagereq>
       <packagereq type="optional">lv</packagereq>
       <packagereq type="optional">m17n-db-chinese</packagereq>
       <packagereq type="optional">scim-array</packagereq>
@@ -691,6 +696,7 @@
       <packagereq type="optional">scim-python-xingma-erbi</packagereq>
       <packagereq type="optional">scim-python-xingma-wubi</packagereq>
       <packagereq type="optional">scim-python-xingma-zhengma</packagereq>
+      <packagereq type="optional">scim-tables-chinese</packagereq>
       <packagereq type="optional">scim-tables-chinese-extra</packagereq>
       <packagereq type="optional">stardict-dic-zh_CN</packagereq>
       <packagereq type="optional">stardict-dic-zh_TW</packagereq>
@@ -1810,7 +1816,6 @@
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
-      <packagereq type="default">ipa-pgothic-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">kacst-art-fonts</packagereq>
       <packagereq type="default">kacst-book-fonts</packagereq>
@@ -1832,11 +1837,13 @@
       <packagereq type="default">liberation-sans-fonts</packagereq>
       <packagereq type="default">liberation-serif-fonts</packagereq>
       <packagereq type="default">lklug-fonts</packagereq>
+      <packagereq type="default">lohit-assamese-fonts</packagereq>
       <packagereq type="default">lohit-bengali-fonts</packagereq>
       <packagereq type="default">lohit-gujarati-fonts</packagereq>
       <packagereq type="default">lohit-hindi-fonts</packagereq>
       <packagereq type="default">lohit-kannada-fonts</packagereq>
       <packagereq type="default">lohit-maithili-fonts</packagereq>
+      <packagereq type="default">lohit-marathi-fonts</packagereq>
       <packagereq type="default">lohit-oriya-fonts</packagereq>
       <packagereq type="default">lohit-punjabi-fonts</packagereq>
       <packagereq type="default">lohit-tamil-fonts</packagereq>
@@ -1848,6 +1855,7 @@
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
+      <packagereq type="default">vlgothic-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-3-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-fonts</packagereq>
@@ -1954,6 +1962,7 @@
       <packagereq type="optional">inkboy-fonts</packagereq>
       <packagereq type="optional">ipa-gothic-fonts</packagereq>
       <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
       <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">khmeros-battambang-fonts</packagereq>
       <packagereq type="optional">khmeros-bokor-fonts</packagereq>
@@ -1971,11 +1980,9 @@
       <packagereq type="optional">lilypond-feta-fonts</packagereq>
       <packagereq type="optional">lilypond-parmesan-fonts</packagereq>
       <packagereq type="optional">linux-libertine-fonts</packagereq>
-      <packagereq type="optional">lohit-assamese-fonts</packagereq>
       <packagereq type="optional">lohit-kashmiri-fonts</packagereq>
       <packagereq type="optional">lohit-konkani-fonts</packagereq>
       <packagereq type="optional">lohit-malayalam-fonts</packagereq>
-      <packagereq type="optional">lohit-marathi-fonts</packagereq>
       <packagereq type="optional">lohit-nepali-fonts</packagereq>
       <packagereq type="optional">lohit-sindhi-fonts</packagereq>
       <packagereq type="optional">madan-fonts</packagereq>
@@ -2076,7 +2083,6 @@
       <packagereq type="optional">un-extra-fonts-vada</packagereq>
       <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
       <packagereq type="optional">vemana2000-fonts</packagereq>
-      <packagereq type="optional">vlgothic-fonts</packagereq>
       <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
@@ -3062,11 +3068,32 @@
       <packagereq type="default">ghc</packagereq>
       <packagereq type="default">ghc-doc</packagereq>
       <packagereq type="default">happy</packagereq>
+      <packagereq type="default">haskell-platform</packagereq>
+      <packagereq type="default">ghc-cgi-devel</packagereq>
+      <packagereq type="default">ghc-editline-devel</packagereq>
+      <packagereq type="default">ghc-fgl-devel</packagereq>
+      <packagereq type="default">ghc-GLUT-devel</packagereq>
+      <packagereq type="default">ghc-haskell-platform-devel</packagereq>
+      <packagereq type="default">ghc-HTTP-devel</packagereq>
+      <packagereq type="default">ghc-network-devel</packagereq>
+      <packagereq type="default">ghc-OpenGL-devel</packagereq>
+      <packagereq type="default">ghc-time-devel</packagereq>
+      <packagereq type="default">ghc-utf8-string-devel</packagereq>
+      <packagereq type="default">ghc-zlib-devel</packagereq>
       <packagereq type="optional">cpphs</packagereq>
-      <packagereq type="optional">ghc-gtk</packagereq>
+      <packagereq type="optional">ghc-gtk-devel</packagereq>
       <packagereq type="optional">ghc-gtk2hs-doc</packagereq>
+      <packagereq type="optional">ghc-haskell-platform-doc</packagereq>
+      <packagereq type="optional">ghc-haskell-platform-prof</packagereq>
+      <packagereq type="optional">ghc-haskell-src-exts-devel</packagereq>
+      <packagereq type="optional">ghc-HUnit-devel</packagereq>
       <packagereq type="optional">ghc-prof</packagereq>
-      <packagereq type="optional">haddock</packagereq>
+      <packagereq type="optional">ghc-tar-devel</packagereq>
+      <packagereq type="optional">ghc-uniplate-devel</packagereq>
+      <packagereq type="optional">ghc-X11-devel</packagereq>
+      <packagereq type="optional">ghc-X11-xft-devel</packagereq>
+      <packagereq type="optional">ghc-xmonad-contrib-devel</packagereq>
+      <packagereq type="optional">hscolour</packagereq>
       <packagereq type="optional">hugs98</packagereq>
       <packagereq type="optional">hugs98-demos</packagereq>
       <packagereq type="optional">xmonad</packagereq>
@@ -3201,8 +3228,9 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="qt">ibus</packagereq>
+      <packagereq type="conditional" requires="gtk2">gtk2-immodule-xim</packagereq>
       <packagereq type="conditional" requires="gtk2">ibus-gtk</packagereq>
+      <packagereq type="conditional" requires="qt">ibus-qt</packagereq>
       <packagereq type="conditional" requires="xfce-utils">imsettings-xfce</packagereq>
       <packagereq type="default">ibus-anthy</packagereq>
       <packagereq type="default">ibus-chewing</packagereq>
@@ -3232,9 +3260,14 @@
       <packagereq type="optional">gok</packagereq>
       <packagereq type="optional">ibus-sayura</packagereq>
       <packagereq type="optional">ibus-table-additional</packagereq>
+      <packagereq type="optional">ibus-table-array30</packagereq>
       <packagereq type="optional">ibus-table-cangjie</packagereq>
       <packagereq type="optional">ibus-table-erbi</packagereq>
+      <packagereq type="optional">ibus-table-quick</packagereq>
+      <packagereq type="optional">ibus-table-translit</packagereq>
       <packagereq type="optional">ibus-table-wubi</packagereq>
+      <packagereq type="optional">ibus-table-xinhua</packagereq>
+      <packagereq type="optional">ibus-table-yong</packagereq>
       <packagereq type="optional">iok</packagereq>
       <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">m17n-contrib-esperanto</packagereq>
@@ -3407,16 +3440,18 @@
       <packagereq type="conditional" requires="poppler">poppler-data</packagereq>
       <packagereq type="conditional" requires="tkgate">tkgate-ja</packagereq>
       <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
-      <packagereq type="default">ipa-gothic-fonts</packagereq>
-      <packagereq type="default">ipa-mincho-fonts</packagereq>
-      <packagereq type="default">ipa-pgothic-fonts</packagereq>
-      <packagereq type="default">ipa-pmincho-fonts</packagereq>
+      <packagereq type="default">vlgothic-fonts</packagereq>
+      <packagereq type="default">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">cmigemo</packagereq>
       <packagereq type="optional">ddskk</packagereq>
       <packagereq type="optional">ddskk-xemacs</packagereq>
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">ebview</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
+      <packagereq type="optional">ipa-gothic-fonts</packagereq>
+      <packagereq type="optional">ipa-mincho-fonts</packagereq>
+      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
+      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">japanese-bitmap-fonts</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
@@ -3443,8 +3478,6 @@
       <packagereq type="optional">stardict-dic-ja</packagereq>
       <packagereq type="optional">uim-canna</packagereq>
       <packagereq type="optional">uim-skk</packagereq>
-      <packagereq type="optional">vlgothic-fonts</packagereq>
-      <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">wkf</packagereq>
     </packagelist>
   </group>
@@ -3613,6 +3646,7 @@
       <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
+      <packagereq type="conditional" requires="hunspell">hunspell-kn</packagereq>
       <packagereq type="conditional" requires="hyphen">hyphen-kn</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
@@ -3632,8 +3666,6 @@
       <packagereq type="mandatory">m17n-contrib-kashmiri</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="default">m17n-contrib-hindi</packagereq>
-      <packagereq type="default">m17n-db-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3863,8 +3895,6 @@
       <packagereq type="mandatory">lohit-konkani-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="default">m17n-contrib-hindi</packagereq>
-      <packagereq type="default">m17n-db-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3972,7 +4002,6 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="default">bitmap-fonts</packagereq>
       <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-ISO8859-15-100dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-misc</packagereq>
@@ -3980,6 +4009,7 @@
       <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
       <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
       <packagereq type="optional">bitmap-cjk-fonts</packagereq>
+      <packagereq type="optional">bitmap-fonts</packagereq>
       <packagereq type="optional">ctan-musixtex-fonts</packagereq>
       <packagereq type="optional">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="optional">culmus-caladings-clm-fonts</packagereq>
@@ -4869,6 +4899,7 @@
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Punjabi</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-pa_IN</packagereq>
       <packagereq type="default">iok</packagereq>
+      <packagereq type="default">saab-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4933,6 +4964,7 @@
       <packagereq type="optional">fonts-KOI8-R</packagereq>
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">ibus-table-translit</packagereq>
       <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
       <packagereq type="optional">scim-tables-russian</packagereq>
@@ -5027,6 +5059,7 @@
     <packagelist>
       <packagereq type="mandatory">lohit-sindhi-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sindhi</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
   </group>
@@ -5358,9 +5391,22 @@
       <packagereq type="default">sugar-terminal</packagereq>
       <packagereq type="default">sugar-turtleart</packagereq>
       <packagereq type="default">sugar-write</packagereq>
+      <packagereq type="optional">sugar-analyze</packagereq>
+      <packagereq type="optional">sugar-clock</packagereq>
+      <packagereq type="optional">sugar-connect</packagereq>
+      <packagereq type="optional">sugar-distance</packagereq>
+      <packagereq type="optional">sugar-emulator</packagereq>
       <packagereq type="optional">sugar-finance</packagereq>
+      <packagereq type="optional">sugar-flipsticks</packagereq>
       <packagereq type="optional">sugar-help</packagereq>
+      <packagereq type="optional">sugar-implode</packagereq>
+      <packagereq type="optional">sugar-infoslicer</packagereq>
+      <packagereq type="optional">sugar-memorize</packagereq>
       <packagereq type="optional">sugar-moon</packagereq>
+      <packagereq type="optional">sugar-playgo</packagereq>
+      <packagereq type="optional">sugar-record</packagereq>
+      <packagereq type="optional">sugar-speak</packagereq>
+      <packagereq type="optional">sugar-update-control</packagereq>
       <packagereq type="optional">sugar-xoirc</packagereq>
       <packagereq type="optional">sugar-xomail</packagereq>
     </packagelist>
@@ -5668,7 +5714,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ta_IN</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">samyak-tamil-fonts</packagereq>
-      <packagereq type="optional">serafettin-cartoon-fonts</packagereq>
+      <packagereq type="default">serafettin-cartoon-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5688,7 +5734,8 @@
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="optional">pothana2000-fonts</packagereq>
+      <packagereq type="default">pothana2000-fonts</packagereq>
+      <packagereq type="default">vemana2000-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5920,6 +5967,7 @@
       <packagereq type="mandatory">paktype-tehreer-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ur</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">nafees-web-naskh-fonts</packagereq>
@@ -6555,6 +6603,15 @@
       <groupid>virtualization</groupid>
     </grouplist>
   </category>
+  <category>
+    <id>content</id>
+    <_name>Content</_name>
+    <_description>Text and other Free content.</_description>
+    <display_order>99</display_order>
+    <grouplist>
+      <groupid>books</groupid>
+    </grouplist>
+  </category>
   <blacklist>
     <package name="dev"/>
     <package name="system-config-mouse"/>