comps comps-fe7.xml.in,1.159,1.160

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Thu Apr 19 20:16:53 UTC 2007


Author: notting

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25261

Modified Files:
	comps-fe7.xml.in 
Log Message:
merge stage 1. merge in comps-fc7.xml.in



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.159 -r 1.160 comps-fe7.xml.in
Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- comps-fe7.xml.in	19 Apr 2007 18:25:10 -0000	1.159
+++ comps-fe7.xml.in	19 Apr 2007 20:16:23 -0000	1.160
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
+<comps xmlns="">
   <group>
     <id>admin-tools</id>
     <_name>Administration Tools</_name>
@@ -8,6 +8,16 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">authconfig-gtk</packagereq>
+      <packagereq type="default">pirut</packagereq>
+      <packagereq type="default">system-config-date</packagereq>
+      <packagereq type="default">system-config-keyboard</packagereq>
+      <packagereq type="default">system-config-language</packagereq>
+      <packagereq type="default">system-config-lvm</packagereq>
+      <packagereq type="default">system-config-network</packagereq>
+      <packagereq type="default">system-config-rootpassword</packagereq>
+      <packagereq type="default">system-config-soundcard</packagereq>
+      <packagereq type="default">system-config-users</packagereq>
       <packagereq type="optional">cacti</packagereq>
       <packagereq type="optional">etherape</packagereq>
       <packagereq type="optional">ettercap-gtk</packagereq>
@@ -18,29 +28,38 @@
       <packagereq type="optional">luma</packagereq>
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
+      <packagereq type="optional">system-config-kickstart</packagereq>
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
   </group>
   <group>
     <id>afrikaans-support</id>
     <_name>Afrikaans Support</_name>
+    <_description/>
     <default>false</default>
     <uservisible>false</uservisible>
     <langonly>af</langonly>
     <packagelist>
+      <packagereq type="conditional" requires="aspell">aspell-af</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-af</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-af_ZA</packagereq>
     </packagelist>
   </group>
   <group>
     <id>arabic-support</id>
     <_name>Arabic Support</_name>
-    <_description>This group is a collection of tools and resources of Arabic environments.</_description>
+    <_description/>
     <default>false</default>
     <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="kdelibs">kde-i18n-Arabic</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ar</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
+      <packagereq type="optional">m17n-db-arabic</packagereq>
     </packagelist>
   </group>
   <group>
@@ -55,12 +74,34 @@
     </packagelist>
   </group>
   <group>
+    <id>assamese-support</id>
+    <_name>Assamese Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>as</langonly>
+    <packagelist>
+      <packagereq type="mandatory">fonts-bengali</packagereq>
+      <packagereq type="mandatory">m17n-db-assamese</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>authoring-and-publishing</id>
     <_name>Authoring and Publishing</_name>
-    <_description>These tools allow you to create documentation in the DocBook format and convert them to HTML, PDF, Postscript, and text.</_description>
+    <_description>These tools allow you to create documents in the DocBook format and convert them into HTML, PDF, Postscript, and text.</_description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">docbook-slides</packagereq>
+      <packagereq type="default">docbook-style-dsssl</packagereq>
+      <packagereq type="default">docbook-style-xsl</packagereq>
+      <packagereq type="default">docbook-utils</packagereq>
+      <packagereq type="default">docbook-utils-pdf</packagereq>
+      <packagereq type="default">linuxdoc-tools</packagereq>
+      <packagereq type="default">tetex</packagereq>
+      <packagereq type="default">xhtml1-dtds</packagereq>
+      <packagereq type="default">xmlto</packagereq>
       <packagereq type="optional">abcm2ps</packagereq>
       <packagereq type="optional">BibTool</packagereq>
       <packagereq type="optional">conglomerate</packagereq>
@@ -74,17 +115,158 @@
       <packagereq type="optional">scribus</packagereq>
       <packagereq type="optional">tetex-eurofont</packagereq>
       <packagereq type="optional">tetex-prosper</packagereq>
+      <packagereq type="optional">tetex-xdvi</packagereq>
       <packagereq type="optional">w3c-markup-validator</packagereq>
     </packagelist>
   </group>
   <group>
     <id>base</id>
     <_name>Base</_name>
+    <_description>This group includes a minimal set of packages.  Useful for creating small router/firewall boxes, for example.</_description>
     <default>true</default>
-    <uservisible>true</uservisible>
+    <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="mandatory">acl</packagereq>
+      <packagereq type="mandatory">at</packagereq>
+      <packagereq type="mandatory">attr</packagereq>
+      <packagereq type="mandatory">authconfig</packagereq>
+      <packagereq type="mandatory">bc</packagereq>
+      <packagereq type="mandatory">bind-utils</packagereq>
+      <packagereq type="mandatory">bzip2</packagereq>
+      <packagereq type="mandatory">crontabs</packagereq>
+      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
+      <packagereq type="mandatory">libutempter</packagereq>
+      <packagereq type="mandatory">logrotate</packagereq>
+      <packagereq type="mandatory">lsof</packagereq>
+      <packagereq type="mandatory">mailcap</packagereq>
+      <packagereq type="mandatory">man</packagereq>
+      <packagereq type="mandatory">ntsysv</packagereq>
+      <packagereq type="mandatory">parted</packagereq>
+      <packagereq type="mandatory">pciutils</packagereq>
+      <packagereq type="mandatory">psacct</packagereq>
+      <packagereq type="mandatory">quota</packagereq>
+      <packagereq type="mandatory">tmpwatch</packagereq>
+      <packagereq type="mandatory">traceroute</packagereq>
+      <packagereq type="mandatory">vixie-cron</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-en</packagereq>
+      <packagereq type="default">anacron</packagereq>
+      <packagereq type="default">aspell</packagereq>
+      <packagereq type="default">aspell-en</packagereq>
+      <packagereq type="default">autofs</packagereq>
+      <packagereq type="default">bluez-utils</packagereq>
+      <packagereq type="default">ccid</packagereq>
+      <packagereq type="default">coolkey</packagereq>
+      <packagereq type="default">cpuspeed</packagereq>
+      <packagereq type="default">cryptsetup-luks</packagereq>
+      <packagereq type="default">device-mapper-multipath</packagereq>
+      <packagereq type="default">dhclient</packagereq>
+      <packagereq type="default">dhcpv6_client</packagereq>
+      <packagereq type="default">diskdumputils</packagereq>
+      <packagereq type="default">dmraid</packagereq>
+      <packagereq type="default">dos2unix</packagereq>
+      <packagereq type="default">dosfstools</packagereq>
+      <packagereq type="default">dump</packagereq>
+      <packagereq type="default">eject</packagereq>
+      <packagereq type="default">fbset</packagereq>
+      <packagereq type="default">finger</packagereq>
+      <packagereq type="default">firstboot-tui</packagereq>
+      <packagereq type="default">ftp</packagereq>
+      <packagereq type="default">gnupg</packagereq>
+      <packagereq type="default">gpm</packagereq>
+      <packagereq type="default">iptstate</packagereq>
+      <packagereq type="default">irda-utils</packagereq>
+      <packagereq type="default">irqbalance</packagereq>
+      <packagereq type="default">jwhois</packagereq>
+      <packagereq type="default">krb5-workstation</packagereq>
+      <packagereq type="default">lftp</packagereq>
+      <packagereq type="default">logwatch</packagereq>
+      <packagereq type="default">man-pages</packagereq>
+      <packagereq type="default">mcelog</packagereq>
+      <packagereq type="default">mdadm</packagereq>
+      <packagereq type="default">mgetty</packagereq>
+      <packagereq type="default">microcode_ctl</packagereq>
+      <packagereq type="default">mlocate</packagereq>
+      <packagereq type="default">mtr</packagereq>
+      <packagereq type="default">nano</packagereq>
+      <packagereq type="default">nc</packagereq>
+      <packagereq type="default">NetworkManager</packagereq>
+      <packagereq type="default">nfs-utils</packagereq>
+      <packagereq type="default">nss_db</packagereq>
+      <packagereq type="default">nss_ldap</packagereq>
       <packagereq type="default">ntfs-3g</packagereq>
+      <packagereq type="default">numactl</packagereq>
+      <packagereq type="default">openssh-clients</packagereq>
+      <packagereq type="default">openssh-server</packagereq>
+      <packagereq type="default">pam_ccreds</packagereq>
+      <packagereq type="default">pam_krb5</packagereq>
+      <packagereq type="default">pam_passwdqc</packagereq>
+      <packagereq type="default">pam_pkcs11</packagereq>
[...2634 lines suppressed...]
+      <packagereq type="default">xrestop</packagereq>
+      <packagereq type="optional">icon-naming-utils</packagereq>
+      <packagereq type="optional">icon-slicer</packagereq>
+      <packagereq type="optional">libXp-devel</packagereq>
+      <packagereq type="optional">mesa-libGLU-devel</packagereq>
+      <packagereq type="optional">xorg-x11-server-sdk</packagereq>
+      <packagereq type="optional">xorg-x11-xbitmaps</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>xemacs</id>
     <_name>XEmacs</_name>
     <_description>The XEmacs text editor.</_description>
@@ -1817,31 +3412,132 @@
     </packagelist>
   </group>
   <group>
+    <id>xhosa-support</id>
+    <_name>Xhosa Support</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <langonly>zu</langonly>
+    <packagelist>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-xh_ZA</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>zulu-support</id>
     <_name>Zulu Support</_name>
+    <_description/>
     <default>false</default>
     <uservisible>false</uservisible>
     <langonly>zu</langonly>
     <packagelist>
       <packagereq type="conditional" requires="hunspell">hunspell-zu</packagereq>
+      <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-zu_ZA</packagereq>
     </packagelist>
   </group>
   <category>
+    <id>language-support</id>
+    <_name>Languages</_name>
+    <_description>These packages provide support for various locales including fonts and input methods.</_description>
+    <grouplist>
+      <groupid>afrikaans-support</groupid>
+      <groupid>arabic-support</groupid>
+      <groupid>armenian-support</groupid>
+      <groupid>assamese-support</groupid>
+      <groupid>basque-support</groupid>
+      <groupid>bengali-support</groupid>
+      <groupid>brazilian-support</groupid>
+      <groupid>breton-support</groupid>
+      <groupid>british-support</groupid>
+      <groupid>bulgarian-support</groupid>
+      <groupid>catalan-support</groupid>
+      <groupid>chinese-support</groupid>
+      <groupid>croatian-support</groupid>
+      <groupid>czech-support</groupid>
+      <groupid>danish-support</groupid>
+      <groupid>dutch-support</groupid>
+      <groupid>estonian-support</groupid>
+      <groupid>ethiopic-support</groupid>
+      <groupid>faeroese-support</groupid>
+      <groupid>finnish-support</groupid>
+      <groupid>french-support</groupid>
+      <groupid>gaelic-support</groupid>
+      <groupid>galician-support</groupid>
+      <groupid>german-support</groupid>
+      <groupid>greek-support</groupid>
+      <groupid>gujarati-support</groupid>
+      <groupid>hebrew-support</groupid>
+      <groupid>hindi-support</groupid>
+      <groupid>hungarian-support</groupid>
+      <groupid>icelandic-support</groupid>
+      <groupid>indonesian-support</groupid>
+      <groupid>irish-support</groupid>
+      <groupid>italian-support</groupid>
+      <groupid>japanese-support</groupid>
+      <groupid>kannada-support</groupid>
+      <groupid>korean-support</groupid>
+      <groupid>lithuanian-support</groupid>
+      <groupid>malay-support</groupid>
+      <groupid>malayalam-support</groupid>
+      <groupid>marathi-support</groupid>
+      <groupid>northern-sotho-support</groupid>
+      <groupid>norwegian-support</groupid>
+      <groupid>oriya-support</groupid>
+      <groupid>polish-support</groupid>
+      <groupid>portuguese-support</groupid>
+      <groupid>punjabi-support</groupid>
+      <groupid>romanian-support</groupid>
+      <groupid>russian-support</groupid>
+      <groupid>serbian-support</groupid>
+      <groupid>sinhala-support</groupid>
+      <groupid>slovak-support</groupid>
+      <groupid>slovenian-support</groupid>
+      <groupid>southern-ndebele-support</groupid>
+      <groupid>southern-sotho-support</groupid>
+      <groupid>spanish-support</groupid>
+      <groupid>swati-support</groupid>
+      <groupid>swedish-support</groupid>
+      <groupid>tamil-support</groupid>
+      <groupid>telugu-support</groupid>
+      <groupid>thai-support</groupid>
+      <groupid>tibetan-support</groupid>
+      <groupid>tsonga-support</groupid>
+      <groupid>tswana-support</groupid>
+      <groupid>turkish-support</groupid>
+      <groupid>ukrainian-support</groupid>
+      <groupid>urdu-support</groupid>
+      <groupid>venda-support</groupid>
+      <groupid>welsh-support</groupid>
+      <groupid>xhosa-support</groupid>
+      <groupid>zulu-support</groupid>
+    </grouplist>
+  </category>
+  <category>
     <id>desktops</id>
     <_name>Desktop Environments</_name>
     <_description>Desktop environments</_description>
     <display_order>10</display_order>
     <grouplist>
+      <groupid>gnome-desktop</groupid>
+      <groupid>kde-desktop</groupid>
       <groupid>xfce-desktop</groupid>
     </grouplist>
   </category>
   <category>
     <id>apps</id>
     <_name>Applications</_name>
-    <_description>Applications for a variety of tasks</_description>
+    <_description>Applications to perform a variety of tasks</_description>
     <display_order>20</display_order>
     <grouplist>
+      <groupid>authoring-and-publishing</groupid>
+      <groupid>editors</groupid>
       <groupid>education</groupid>
+      <groupid>engineering-and-scientific</groupid>
+      <groupid>games</groupid>
+      <groupid>graphical-internet</groupid>
+      <groupid>graphics</groupid>
+      <groupid>office</groupid>
+      <groupid>sound-and-video</groupid>
+      <groupid>text-internet</groupid>
     </grouplist>
   </category>
   <category>
@@ -1850,7 +3546,16 @@
     <_description>Packages which provide functionality for developing and building applications.</_description>
     <display_order>70</display_order>
     <grouplist>
+      <groupid>development-libs</groupid>
+      <groupid>development-tools</groupid>
+      <groupid>eclipse</groupid>
+      <groupid>gnome-software-development</groupid>
+      <groupid>java-development</groupid>
+      <groupid>kde-software-development</groupid>
+      <groupid>legacy-software-development</groupid>
+      <groupid>ruby</groupid>
       <groupid>web-development</groupid>
+      <groupid>x-software-development</groupid>
       <groupid>xfce-software-development</groupid>
     </grouplist>
   </category>
@@ -1860,7 +3565,19 @@
     <_description>Software used for running network servers</_description>
     <display_order>90</display_order>
     <grouplist>
+      <groupid>clustering</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>legacy-network-server</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
       <groupid>network-server</groupid>
+      <groupid>news-server</groupid>
+      <groupid>printing</groupid>
+      <groupid>server-cfg</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>web-server</groupid>
     </grouplist>
   </category>
   <category>
@@ -1869,7 +3586,15 @@
     <_description>Various core pieces of the system.</_description>
     <display_order>99</display_order>
     <grouplist>
+      <groupid>admin-tools</groupid>
+      <groupid>base</groupid>
+      <groupid>base-x</groupid>
+      <groupid>dial-up</groupid>
       <groupid>hardware-support</groupid>
+      <groupid>java</groupid>
+      <groupid>legacy-software-support</groupid>
+      <groupid>system-tools</groupid>
+      <groupid>virtualization</groupid>
     </grouplist>
   </category>
 </comps>




More information about the scm-commits mailing list