From eb48011d26f20832ff3fd27806ee0134a31faf9f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 14 Jun 2013 14:30:17 -0700 Subject: [PATCH] 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. --- comps-f19.xml.in | 7 ++++--- comps-f20.xml.in | 41 +++++++++++------------------------------ 2 files changed, 15 insertions(+), 33 deletions(-) diff --git a/comps-f19.xml.in b/comps-f19.xml.in index fd038846..629e5870 100644 --- a/comps-f19.xml.in +++ b/comps-f19.xml.in @@ -399,7 +399,6 @@ false false - abrt-desktop alsa-utils recordmydesktop setroubleshoot @@ -561,7 +560,6 @@ false false - abrt-desktop recordmydesktop setroubleshoot lxde-common @@ -989,9 +987,9 @@ false true + abrt-desktop authconfig-gtk gnome-disk-utility - gnome-packagekit setroubleshoot system-config-date system-config-keyboard @@ -5982,6 +5980,7 @@ base-x standard core + admin-tools dial-up fonts input-methods @@ -6008,6 +6007,7 @@ base-x standard core + admin-tools dial-up fonts input-methods @@ -6056,6 +6056,7 @@ base-x standard core + admin-tools fonts input-methods multimedia diff --git a/comps-f20.xml.in b/comps-f20.xml.in index 2f9de73c..b178fd3a 100644 --- a/comps-f20.xml.in +++ b/comps-f20.xml.in @@ -400,7 +400,6 @@ false false - abrt-desktop alsa-utils recordmydesktop setroubleshoot @@ -562,7 +561,6 @@ false false - abrt-desktop recordmydesktop setroubleshoot lxde-common @@ -990,33 +988,14 @@ false true - authconfig-gtk - gnome-disk-utility - gnome-packagekit - setroubleshoot - system-config-date - system-config-keyboard - system-config-language - system-config-users - apper - cacti - dbench - etherape - ettercap - galternatives - gparted - gpointing-device-settings - kde-partitionmanager - lshw-gui - luma - ntop - pessulus - qtparted - system-config-boot - system-config-firewall - system-config-kickstart - system-config-rootpassword - yumex + abrt-desktop + authconfig-gtk + gnome-disk-utility + setroubleshoot + system-config-date + system-config-keyboard + system-config-language + system-config-users