f19 and f20: clean up admin-tools group, use it for LXDE, Xfce and MATE

The 'admin-tools' group contains several utilities that would actually be
useful for many desktops, but it got lost in the shuffle between F17 and
F18. This commit drops gnome-packagekit from it (other desktops don't
necessarily want it, they may choose apper or yumex) and adds abrt-desktop
(which all the desktops were adding separately), and adds the group to the
LXDE, Xfce and MATE desktops: I am not yet sure whether the KDE, Cinnamon
or Sugar desktops would want it, and I'm pretty sure GNOME does not. For
F20 only, the commit also drops all the 'optional' stuff from the group,
as optional is pretty much a no-op now anyway.
This commit is contained in:
Adam Williamson 2013-06-14 14:30:17 -07:00
parent c126192900
commit eb48011d26
2 changed files with 15 additions and 33 deletions

View File

@ -399,7 +399,6 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq>abrt-desktop</packagereq>
<packagereq>alsa-utils</packagereq>
<packagereq>recordmydesktop</packagereq>
<packagereq>setroubleshoot</packagereq>
@ -561,7 +560,6 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq>abrt-desktop</packagereq>
<packagereq>recordmydesktop</packagereq>
<packagereq>setroubleshoot</packagereq>
<packagereq>lxde-common</packagereq>
@ -989,9 +987,9 @@
<default>false</default>
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">abrt-desktop</packagereq>
<packagereq type="default">authconfig-gtk</packagereq>
<packagereq type="default">gnome-disk-utility</packagereq>
<packagereq type="default">gnome-packagekit</packagereq>
<packagereq type="default">setroubleshoot</packagereq>
<packagereq type="default">system-config-date</packagereq>
<packagereq type="default">system-config-keyboard</packagereq>
@ -5982,6 +5980,7 @@
<groupid>base-x</groupid>
<groupid>standard</groupid>
<groupid>core</groupid>
<groupid>admin-tools</groupid>
<groupid>dial-up</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>
@ -6008,6 +6007,7 @@
<groupid>base-x</groupid>
<groupid>standard</groupid>
<groupid>core</groupid>
<groupid>admin-tools</groupid>
<groupid>dial-up</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>
@ -6056,6 +6056,7 @@
<groupid>base-x</groupid>
<groupid>standard</groupid>
<groupid>core</groupid>
<groupid>admin-tools</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>
<groupid>multimedia</groupid>

View File

@ -400,7 +400,6 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq>abrt-desktop</packagereq>
<packagereq>alsa-utils</packagereq>
<packagereq>recordmydesktop</packagereq>
<packagereq>setroubleshoot</packagereq>
@ -562,7 +561,6 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq>abrt-desktop</packagereq>
<packagereq>recordmydesktop</packagereq>
<packagereq>setroubleshoot</packagereq>
<packagereq>lxde-common</packagereq>
@ -990,33 +988,14 @@
<default>false</default>
<uservisible>true</uservisible>
<packagelist>
<packagereq type="default">authconfig-gtk</packagereq>
<packagereq type="default">gnome-disk-utility</packagereq>
<packagereq type="default">gnome-packagekit</packagereq>
<packagereq type="default">setroubleshoot</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-users</packagereq>
<packagereq type="optional">apper</packagereq>
<packagereq type="optional">cacti</packagereq>
<packagereq type="optional">dbench</packagereq>
<packagereq type="optional">etherape</packagereq>
<packagereq type="optional">ettercap</packagereq>
<packagereq type="optional">galternatives</packagereq>
<packagereq type="optional">gparted</packagereq>
<packagereq type="optional">gpointing-device-settings</packagereq>
<packagereq type="optional">kde-partitionmanager</packagereq>
<packagereq type="optional">lshw-gui</packagereq>
<packagereq type="optional">luma</packagereq>
<packagereq type="optional">ntop</packagereq>
<packagereq type="optional">pessulus</packagereq>
<packagereq type="optional">qtparted</packagereq>
<packagereq type="optional">system-config-boot</packagereq>
<packagereq type="optional">system-config-firewall</packagereq>
<packagereq type="optional">system-config-kickstart</packagereq>
<packagereq type="optional">system-config-rootpassword</packagereq>
<packagereq type="optional">yumex</packagereq>
<packagereq>abrt-desktop</packagereq>
<packagereq>authconfig-gtk</packagereq>
<packagereq>gnome-disk-utility</packagereq>
<packagereq>setroubleshoot</packagereq>
<packagereq>system-config-date</packagereq>
<packagereq>system-config-keyboard</packagereq>
<packagereq>system-config-language</packagereq>
<packagereq>system-config-users</packagereq>
</packagelist>
</group>
<!--
@ -4200,7 +4179,6 @@
<packagelist>
<packagereq>lightdm</packagereq>
<packagereq>initial-setup</packagereq>
<packagereq>abrt-desktop</packagereq>
<packagereq>recordmydesktop</packagereq>
<packagereq>setroubleshoot</packagereq>
<packagereq>ConsoleKit-x11</packagereq>
@ -6006,6 +5984,7 @@
<groupid>base-x</groupid>
<groupid>standard</groupid>
<groupid>core</groupid>
<groupid>admin-tools</groupid>
<groupid>dial-up</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>
@ -6032,6 +6011,7 @@
<groupid>base-x</groupid>
<groupid>standard</groupid>
<groupid>core</groupid>
<groupid>admin-tools</groupid>
<groupid>dial-up</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>
@ -6080,6 +6060,7 @@
<groupid>base-x</groupid>
<groupid>standard</groupid>
<groupid>core</groupid>
<groupid>admin-tools</groupid>
<groupid>dial-up</groupid>
<groupid>fonts</groupid>
<groupid>input-methods</groupid>