changes to base-x comps group

Bill Nottingham notting at redhat.com
Fri Feb 4 17:11:44 UTC 2011


(Attempting to CC relevant spins/groups maintainers)

I'm looking to do some rework of the base-x comps group. Right now, its
main purpose in life is to provide the X server that is used by the
various desktops (and the window-managers group, I suppose). However, given
that, it has stuff in it that it really shouldn't - configuration tools,
applets, session services, and so on.

Attached is a patch series that attempts to remove this cruft from the
base-x group, and place it, where relevant, in the appropriate desktop
groups. (At least, the cruft that was on by default - I haven't attempted
to weed out the optional packages yet.)

Does this look sane, as far as it touches your particular desktop? In many
cases, these tools/apps were getting removed/disabled by the live spins
anyway.

Bill
-------------- next part --------------
commit 88a97705e745600d6b28dd065ec0a90a62283907
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Jan 28 16:10:09 2011 -0500

    Move assorted tools (ssh-askpass, gnome-packagekit, abrt-desktop) out of base-x and into appropriate desktop environments.
    
    Also, make krb5-auth-dialog optional.

diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index c7dc984..29cdd5c 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -379,15 +379,11 @@
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
-      <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
       <packagereq type="default">desktop-backgrounds-basic</packagereq>
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">glx-utils</packagereq>
-      <packagereq type="default">gnome-packagekit</packagereq>
-      <packagereq type="default">krb5-auth-dialog</packagereq>
       <packagereq type="default">mesa-dri-drivers</packagereq>
-      <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">plymouth-system-theme</packagereq>
       <packagereq type="default">policycoreutils-gui</packagereq>
       <packagereq type="default">policycoreutils-restorecond</packagereq>
@@ -405,6 +401,7 @@
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">gdm</packagereq>
       <packagereq type="optional">gxmessage</packagereq>
+      <packagereq type="optional">krb5-auth-dialog</packagereq>
       <packagereq type="optional">lilyterm</packagereq>
       <packagereq type="optional">roxterm</packagereq>
       <packagereq type="optional">rss-glx</packagereq>
@@ -2724,6 +2721,7 @@
       <packagereq type="conditional" requires="imsettings">imsettings-gnome</packagereq>
       <packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-gtk</packagereq>
+      <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">at-spi2-atk</packagereq>
       <packagereq type="default">at-spi2-core</packagereq>
       <packagereq type="default">avahi</packagereq>
@@ -2738,6 +2736,7 @@
       <packagereq type="default">file-roller-nautilus</packagereq>
       <packagereq type="default">gcalctool</packagereq>
       <packagereq type="default">gdm</packagereq>
+      <packagereq type="default">gnome-packagekit</packagereq>
       <packagereq type="default">gdm-plugin-fingerprint</packagereq>
       <packagereq type="default">gdm-user-switch-applet</packagereq>
       <packagereq type="default">gedit</packagereq>
@@ -3887,6 +3886,7 @@
       <packagereq type="conditional" requires="libreoffice-core">libreoffice-kde</packagereq>
       <packagereq type="conditional" requires="pinentry">pinentry-qt</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
+      <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">bluedevil</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
@@ -4416,6 +4416,8 @@
       <packagereq type="mandatory">pcmanfm</packagereq>
       <packagereq type="conditional" requires="imsettings">imsettings-lxde</packagereq>
       <packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
+      <packagereq type="default">abrt-desktop</packagereq>
+      <packagereq type="default">gnome-packagekit</packagereq>
       <packagereq type="default">gpicview</packagereq>
       <packagereq type="default">leafpad</packagereq>
       <packagereq type="default">lxappearance</packagereq>
@@ -4428,6 +4430,7 @@
       <packagereq type="default">lxtask</packagereq>
       <packagereq type="default">lxterminal</packagereq>
       <packagereq type="default">obconf</packagereq>
+      <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
       <packagereq type="optional">lxde-icon-theme</packagereq>
@@ -6707,8 +6710,11 @@
       <packagereq type="mandatory">xfwm4</packagereq>
       <packagereq type="conditional" requires="imsettings">imsettings-xfce</packagereq>
       <packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
+      <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">gdm</packagereq>
+      <packagereq type="default">gnome-packagekit</packagereq>
       <packagereq type="default">mousepad</packagereq>
+      <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">orage</packagereq>
       <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">Terminal</packagereq>
-------------- next part --------------
commit 35ff3b1d21ab454769b52bce98db8beb66749196
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Jan 28 16:24:54 2011 -0500

    Move system-config-* tools from base-x to appropriate desktops.
    
    In Admin tools, make s-c-network optional, and swap gnome-disk-utility for s-c-lvm.

diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index 29cdd5c..77976b2 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -9,14 +9,13 @@
     <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">system-config-boot</packagereq>
       <packagereq type="default">system-config-date</packagereq>
       <packagereq type="default">system-config-firewall</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-users</packagereq>
       <packagereq type="optional">cacti</packagereq>
       <packagereq type="optional">dbench</packagereq>
@@ -34,6 +33,8 @@
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
       <packagereq type="optional">system-config-kickstart</packagereq>
+      <packagereq type="optional">system-config-lvm</packagereq>
+      <packagereq type="optional">system-config-network</packagereq>
       <packagereq type="optional">system-config-rootpassword</packagereq>
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
@@ -385,16 +386,9 @@
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">mesa-dri-drivers</packagereq>
       <packagereq type="default">plymouth-system-theme</packagereq>
-      <packagereq type="default">policycoreutils-gui</packagereq>
-      <packagereq type="default">policycoreutils-restorecond</packagereq>
       <packagereq type="default">policycoreutils-sandbox</packagereq>
       <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">smolt-firstboot</packagereq>
-      <packagereq type="default">system-config-date</packagereq>
-      <packagereq type="default">system-config-firewall</packagereq>
-      <packagereq type="default">system-config-network</packagereq>
-      <packagereq type="default">system-config-services</packagereq>
-      <packagereq type="default">system-config-users</packagereq>
       <packagereq type="default">xorg-x11-utils</packagereq>
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
@@ -2787,6 +2781,7 @@
       <packagereq type="default">seahorse</packagereq>
       <packagereq type="default">shotwell</packagereq>
       <packagereq type="default">simple-scan</packagereq>
+      <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">vinagre</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
@@ -3925,6 +3920,9 @@
       <packagereq type="default">qtcurve-gtk2</packagereq>
       <packagereq type="default">qtcurve-kde4</packagereq>
       <packagereq type="default">scribus</packagereq>
+      <packagereq type="default">system-config-date</packagereq>
+      <packagereq type="default">system-config-firewall</packagereq>
+      <packagereq type="default">system-config-services</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
       <!-- See http://bugzilla.redhat.com/537609 on why xorg-x11-apps is here -->
       <packagereq type="default">xorg-x11-apps</packagereq>
@@ -4431,6 +4429,10 @@
       <packagereq type="default">lxterminal</packagereq>
       <packagereq type="default">obconf</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
+      <packagereq type="default">system-config-date</packagereq>
+      <packagereq type="default">system-config-firewall</packagereq>
+      <packagereq type="default">system-config-services</packagereq>
+      <packagereq type="default">system-config-users</packagereq>
       <packagereq type="default">xarchiver</packagereq>
       <packagereq type="default">xscreensaver-base</packagereq>
       <packagereq type="optional">lxde-icon-theme</packagereq>
@@ -6717,6 +6719,10 @@
       <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">orage</packagereq>
       <packagereq type="default">polkit-gnome</packagereq>
+      <packagereq type="default">system-config-date</packagereq>
+      <packagereq type="default">system-config-firewall</packagereq>
+      <packagereq type="default">system-config-services</packagereq>
+      <packagereq type="default">system-config-users</packagereq>
       <packagereq type="default">Terminal</packagereq>
       <packagereq type="default">thunar-archive-plugin</packagereq>
       <packagereq type="default">thunar-volman</packagereq>
-------------- next part --------------
commit 443be0a045823279aec214c0b50f7d59994bb5dc
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Jan 28 16:26:21 2011 -0500

    Move setroubleshoot from base-x to admin-tools.

diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index 77976b2..9431e79 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -11,6 +11,7 @@
       <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-boot</packagereq>
       <packagereq type="default">system-config-date</packagereq>
       <packagereq type="default">system-config-firewall</packagereq>
@@ -387,7 +388,6 @@
       <packagereq type="default">mesa-dri-drivers</packagereq>
       <packagereq type="default">plymouth-system-theme</packagereq>
       <packagereq type="default">policycoreutils-sandbox</packagereq>
-      <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">smolt-firstboot</packagereq>
       <packagereq type="default">xorg-x11-utils</packagereq>
       <packagereq type="optional">alltray</packagereq>


More information about the devel mailing list