Merge branch 'master' of ssh://git.fedorahosted.org/git/comps

This commit is contained in:
Christoph Wickert 2011-05-30 19:01:44 +02:00
commit 27deb3f667
5 changed files with 49 additions and 9 deletions

View File

@ -2074,6 +2074,41 @@
<uservisible>true</uservisible>
<packagelist/>
</group>
<group>
<id>xfce-desktop</id>
<_name>Xfce</_name>
<_description>A lightweight desktop environment that works well on low end machines.</_description>
<default>false</default>
<uservisible>true</uservisible>
<packagelist>
<packagereq type="mandatory">Thunar</packagereq>
<packagereq type="mandatory">xfce-utils</packagereq>
<packagereq type="mandatory">xfce4-panel</packagereq>
<packagereq type="mandatory">xfce4-session</packagereq>
<packagereq type="mandatory">xfce4-settings</packagereq>
<packagereq type="mandatory">xfconf</packagereq>
<packagereq type="mandatory">xfdesktop</packagereq>
<packagereq type="mandatory">xfwm4</packagereq>
<packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
<packagereq type="default">gdm</packagereq>
<packagereq type="default">leafpad</packagereq>
<packagereq type="default">NetworkManager-gnome</packagereq>
<packagereq type="default">openssh-askpass</packagereq>
<packagereq type="default">orage</packagereq>
<packagereq type="default">polkit-gnome</packagereq>
<packagereq type="default">Terminal</packagereq>
<packagereq type="default">thunar-archive-plugin</packagereq>
<packagereq type="default">thunar-volman</packagereq>
<packagereq type="default">tumbler</packagereq>
<packagereq type="default">xfce4-appfinder</packagereq>
<packagereq type="default">xfce4-icon-theme</packagereq>
<packagereq type="default">xfce4-mixer</packagereq>
<packagereq type="default">xfce4-power-manager</packagereq>
<packagereq type="default">xfce4-session-engines</packagereq>
<packagereq type="default">xfwm4-theme-nodoka</packagereq>
<packagereq type="optional">xfwm4-themes</packagereq>
</packagelist>
</group>
<group>
<id>xhosa-support</id>
<_name>Xhosa Support</_name>

View File

@ -6355,6 +6355,7 @@
<packagelist>
<packagereq type="optional">bbkeys</packagereq>
<packagereq type="optional">blackbox</packagereq>
<packagereq type="optional">bluetile</packagereq>
<packagereq type="optional">fluxbox</packagereq>
<packagereq type="optional">fluxconf</packagereq>
<packagereq type="optional">fvwm</packagereq>

View File

@ -6355,6 +6355,7 @@
<packagelist>
<packagereq type="optional">bbkeys</packagereq>
<packagereq type="optional">blackbox</packagereq>
<packagereq type="optional">bluetile</packagereq>
<packagereq type="optional">fluxbox</packagereq>
<packagereq type="optional">fluxconf</packagereq>
<packagereq type="optional">fvwm</packagereq>

View File

@ -2939,7 +2939,6 @@
<packagereq type="default">firefox</packagereq>
<packagereq type="default">icedtea-web</packagereq>
<packagereq type="default">nspluginwrapper</packagereq>
<packagereq type="default">pino</packagereq>
<packagereq type="default">transmission-gtk</packagereq>
<packagereq type="optional">amsn</packagereq>
<packagereq type="optional">arora</packagereq>
@ -2999,6 +2998,7 @@
<packagereq type="optional">pan</packagereq>
<packagereq type="optional">pidgin</packagereq>
<packagereq type="optional">pidgin-libnotify</packagereq>
<packagereq type="optional">pino</packagereq>
<packagereq type="optional">prozilla</packagereq>
<packagereq type="optional">psi</packagereq>
<packagereq type="optional">psimedia</packagereq>
@ -3188,6 +3188,7 @@
<default>true</default>
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">aic94xx-firmware</packagereq>
<packagereq type="default">alsa-firmware</packagereq>
<packagereq type="default">ar9170-firmware</packagereq>
<packagereq type="default">atmel-firmware</packagereq>
@ -3409,7 +3410,6 @@
<packagereq type="conditional" requires="gtk2">ibus-gtk2</packagereq>
<packagereq type="conditional" requires="gtk3">ibus-gtk3</packagereq>
<packagereq type="conditional" requires="qt">ibus-qt</packagereq>
<packagereq type="conditional" requires="control-center">im-chooser-gnome3</packagereq>
<packagereq type="conditional" requires="gnome-session">imsettings-gnome</packagereq>
<packagereq type="conditional" requires="lxde-common">imsettings-lxde</packagereq>
<packagereq type="conditional" requires="qt">imsettings-qt</packagereq>
@ -5810,17 +5810,16 @@
<uservisible>true</uservisible>
<packagelist>
<packagereq type="mandatory">sugar</packagereq>
<packagereq type="default">csound-python</packagereq>
<packagereq type="default">etoys-sugar</packagereq>
<packagereq type="default">gdm</packagereq>
<packagereq type="default">sugar-abacus</packagereq>
<packagereq type="default">sugar-browse</packagereq>
<packagereq type="default">sugar-calculator</packagereq>
<packagereq type="default">sugar-chat</packagereq>
<packagereq type="default">sugar-log</packagereq>
<packagereq type="default">sugar-memorize</packagereq>
<packagereq type="default">sugar-physics</packagereq>
<packagereq type="default">sugar-pippy</packagereq>
<packagereq type="default">sugar-read</packagereq>
<packagereq type="default">sugar-record</packagereq>
<packagereq type="default">sugar-speak</packagereq>
<packagereq type="default">sugar-surf</packagereq>
@ -5829,6 +5828,7 @@
<packagereq type="default">sugar-write</packagereq>
<packagereq type="default">sugar-xoirc</packagereq>
<packagereq type="optional">sugar-analyze</packagereq>
<packagereq type="optional">sugar-browse</packagereq>
<packagereq type="optional">sugar-clock</packagereq>
<packagereq type="optional">sugar-connect</packagereq>
<packagereq type="optional">sugar-distance</packagereq>
@ -5842,6 +5842,7 @@
<packagereq type="optional">sugar-jukebox</packagereq>
<packagereq type="optional">sugar-moon</packagereq>
<packagereq type="optional">sugar-playgo</packagereq>
<packagereq type="optional">sugar-read</packagereq>
<packagereq type="optional">sugar-xomail</packagereq>
</packagelist>
</group>
@ -6651,6 +6652,7 @@
<packagelist>
<packagereq type="optional">bbkeys</packagereq>
<packagereq type="optional">blackbox</packagereq>
<packagereq type="optional">bluetile</packagereq>
<packagereq type="optional">fluxbox</packagereq>
<packagereq type="optional">fvwm</packagereq>
<packagereq type="optional">hackedbox</packagereq>

View File

@ -763,7 +763,7 @@
<packagereq type="mandatory">vim-minimal</packagereq>
<packagereq type="mandatory">yum</packagereq>
<packagereq type="default">efibootmgr</packagereq>
<packagereq type="default">grub</packagereq>
<packagereq type="default">grub2</packagereq>
<packagereq type="default">ppc64-utils</packagereq>
<packagereq type="default">s390utils</packagereq>
<packagereq type="default">sendmail</packagereq>
@ -2937,7 +2937,6 @@
<packagereq type="default">firefox</packagereq>
<packagereq type="default">icedtea-web</packagereq>
<packagereq type="default">nspluginwrapper</packagereq>
<packagereq type="default">pino</packagereq>
<packagereq type="default">transmission-gtk</packagereq>
<packagereq type="optional">amsn</packagereq>
<packagereq type="optional">arora</packagereq>
@ -2997,6 +2996,7 @@
<packagereq type="optional">pan</packagereq>
<packagereq type="optional">pidgin</packagereq>
<packagereq type="optional">pidgin-libnotify</packagereq>
<packagereq type="optional">pino</packagereq>
<packagereq type="optional">prozilla</packagereq>
<packagereq type="optional">psi</packagereq>
<packagereq type="optional">psimedia</packagereq>
@ -3186,6 +3186,7 @@
<default>true</default>
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">aic94xx-firmware</packagereq>
<packagereq type="default">alsa-firmware</packagereq>
<packagereq type="default">ar9170-firmware</packagereq>
<packagereq type="default">atmel-firmware</packagereq>
@ -3407,7 +3408,6 @@
<packagereq type="conditional" requires="gtk2">ibus-gtk2</packagereq>
<packagereq type="conditional" requires="gtk3">ibus-gtk3</packagereq>
<packagereq type="conditional" requires="qt">ibus-qt</packagereq>
<packagereq type="conditional" requires="control-center">im-chooser-gnome3</packagereq>
<packagereq type="conditional" requires="gnome-session">imsettings-gnome</packagereq>
<packagereq type="conditional" requires="lxde-common">imsettings-lxde</packagereq>
<packagereq type="conditional" requires="qt">imsettings-qt</packagereq>
@ -5813,17 +5813,16 @@
<uservisible>true</uservisible>
<packagelist>
<packagereq type="mandatory">sugar</packagereq>
<packagereq type="default">csound-python</packagereq>
<packagereq type="default">etoys-sugar</packagereq>
<packagereq type="default">gdm</packagereq>
<packagereq type="default">sugar-abacus</packagereq>
<packagereq type="default">sugar-browse</packagereq>
<packagereq type="default">sugar-calculator</packagereq>
<packagereq type="default">sugar-chat</packagereq>
<packagereq type="default">sugar-log</packagereq>
<packagereq type="default">sugar-memorize</packagereq>
<packagereq type="default">sugar-physics</packagereq>
<packagereq type="default">sugar-pippy</packagereq>
<packagereq type="default">sugar-read</packagereq>
<packagereq type="default">sugar-record</packagereq>
<packagereq type="default">sugar-speak</packagereq>
<packagereq type="default">sugar-surf</packagereq>
@ -5832,6 +5831,7 @@
<packagereq type="default">sugar-write</packagereq>
<packagereq type="default">sugar-xoirc</packagereq>
<packagereq type="optional">sugar-analyze</packagereq>
<packagereq type="optional">sugar-browse</packagereq>
<packagereq type="optional">sugar-clock</packagereq>
<packagereq type="optional">sugar-connect</packagereq>
<packagereq type="optional">sugar-distance</packagereq>
@ -5845,6 +5845,7 @@
<packagereq type="optional">sugar-jukebox</packagereq>
<packagereq type="optional">sugar-moon</packagereq>
<packagereq type="optional">sugar-playgo</packagereq>
<packagereq type="optional">sugar-read</packagereq>
<packagereq type="optional">sugar-xomail</packagereq>
</packagelist>
</group>