Comps change proposal: NetworkManager subpackages

Adam Williamson awilliam at redhat.com
Sat Jun 21 00:25:33 UTC 2014


I've drafted a comps change (further to the quick one I did yesterday to
throw in NetworkManager-wifi to the desktop groups) to account for the
recent (March) split of several bits of NetworkManager functionality
into subpackages. As it's a relatively major change I thought I'd run it
by devel@ for a few days before kicking it in.

AIUI, the split in NM split off:

* wifi support into NetworkManager-wifi
* bluetooth (DUN and PAN? didn't one get dropped? i forget) connection
support into NetworkManager-bluetooth
* cellular modem support into NetworkManager-wwan
* Direct-connected, old-school ADSL modems (not the kind that just make
the connection look like ethernet) into NetworkManager-adsl

I figured that 'typical' client installs of Fedora are likely to still
want these features. dcbw suggested just adding them to the dial-up
group, but that didn't feel quite right to me - I can imagine someone
doing a kickstart or custom image might want to leave 'dial-up' out as
they don't want ISDN/actual dial-up support, but do want this stuff.

In the end I'm proposing that we create a group called
'networkmanager-submodules' and put wifi, bluetooth and wwan into that.
adsl would go into 'dial-up' (it seems to be a good fit - those ancient
ADSL modems are almost as old news as actual dial-up modems, these
days). All the desktop environment groups which currently pull in
'dial-up' are modified to also pull in 'networkmanager-submodules', and
the direct addition of 'NetworkManager-wifi' to the desktop package
groups is dropped again.

Note that this patch wouldn't include 'networkmanager-submodules' in any
of the server package groups. We'll probably be kinda revising those
with Fedora Server anyway, but even if they remain at all relevant, I
think it probably makes sense to expect server machines to have wired
ethernet connections (and they might appreciate *not* having all the
wifi, bluetooth and wwan stuff installed).

For clarity I've generated the patch with 20 lines of context rather
than the usual 3, given the particular layout of comps which makes it
pretty hard to figure out where any given change is without a lot of
context.

Does this look good to everyone? If there are no objections, corrections
or improvements, I'll commit it pretty soon.

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 322430a..1963d2b 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -132,41 +132,40 @@
       <packagereq>gvfs-afc</packagereq>
       <packagereq>gvfs-afp</packagereq>
       <packagereq>gvfs-archive</packagereq>
       <packagereq>gvfs-goa</packagereq>
       <packagereq>gvfs-gphoto2</packagereq>
       <packagereq>gvfs-mtp</packagereq>
       <packagereq>gvfs-smb</packagereq>
       <packagereq>libcanberra-gtk2</packagereq>
       <packagereq>libcanberra-gtk3</packagereq>
       <packagereq>libproxy-mozjs</packagereq>
       <packagereq>librsvg2</packagereq>
       <packagereq>libsane-hpaio</packagereq>
       <packagereq>mousetweaks</packagereq>
       <packagereq>nautilus</packagereq>
       <packagereq>nautilus-sendto</packagereq>
       <packagereq>NetworkManager-l2tp</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn-gnome</packagereq>
       <packagereq>NetworkManager-pptp-gnome</packagereq>
       <packagereq>NetworkManager-vpnc-gnome</packagereq>
-      <packagereq>NetworkManager-wifi</packagereq>
       <packagereq>nm-connection-editor</packagereq>
       <packagereq>orca</packagereq>
       <packagereq>PackageKit-command-not-found</packagereq>
       <packagereq>PackageKit-gtk3-module</packagereq>
       <packagereq>polkit-js-engine</packagereq>
       <packagereq>rhythmbox</packagereq>
       <packagereq>rygel</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
       <packagereq>seahorse</packagereq>
       <packagereq>shotwell</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>sushi</packagereq>
       <packagereq>totem</packagereq>
       <packagereq>totem-mozplugin</packagereq>
       <packagereq>totem-nautilus</packagereq>
       <packagereq>transmission-gtk</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>vinagre</packagereq>
       <packagereq>yelp</packagereq>
     </packagelist>
@@ -252,41 +251,40 @@
       <packagereq>cups-pk-helper</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>gwenview</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>kamera</packagereq>
       <packagereq>kamoso</packagereq>
       <packagereq>kcalc</packagereq>
       <packagereq>kcharselect</packagereq>
       <packagereq>kcm-gtk</packagereq>
       <packagereq>kcm_touchpad</packagereq>
       <packagereq>kcolorchooser</packagereq>
       <packagereq>kde-baseapps</packagereq>
       <packagereq>kde-plasma-nm</packagereq>
       <packagereq>kde-plasma-nm-l2tp</packagereq>
       <packagereq>kde-plasma-nm-openconnect</packagereq>
       <packagereq>kde-plasma-nm-openswan</packagereq>
       <packagereq>kde-plasma-nm-openvpn</packagereq>
       <packagereq>kde-plasma-nm-pptp</packagereq>
       <packagereq>kde-plasma-nm-vpnc</packagereq>
       <packagereq>kde-print-manager</packagereq>
-      <packagereq>NetworkManager-wifi</packagereq>
       <packagereq>kde-runtime</packagereq>
       <packagereq>kde-settings-pulseaudio</packagereq>
       <packagereq>kde-workspace</packagereq>
       <packagereq>kdeaccessibility</packagereq>
       <packagereq>kdegames-minimal</packagereq>
       <packagereq>kdegraphics-strigi-analyzer</packagereq>
       <packagereq>kdegraphics-thumbnailers</packagereq>
       <packagereq>kdelibs</packagereq>
       <packagereq>kdepim</packagereq>
       <packagereq>kdeplasma-addons</packagereq>
       <packagereq>kdnssd</packagereq>
       <packagereq>kget</packagereq>
       <packagereq>kgpg</packagereq>
       <packagereq>kipi-plugins</packagereq>
       <packagereq>kmix</packagereq>
       <packagereq>konsole</packagereq>
       <packagereq>kruler</packagereq>
       <packagereq>kscreen</packagereq>
       <packagereq>ksnapshot</packagereq>
       <packagereq>ksshaskpass</packagereq>
@@ -433,41 +431,40 @@
       <packagereq>nm-connection-editor</packagereq>
       <packagereq>openssh-askpass</packagereq>
       <packagereq>rodent-icon-theme</packagereq>
       <packagereq>xfce4-terminal</packagereq>
       <packagereq>thunar-archive-plugin</packagereq>
       <packagereq>thunar-volman</packagereq>
       <packagereq>tumbler</packagereq>
       <packagereq>xfce4-about</packagereq>
       <packagereq>xfce4-appfinder</packagereq>
       <packagereq>xfce4-power-manager</packagereq>
       <packagereq>xfce4-session-engines</packagereq>
       <packagereq>xfwm4-theme-nodoka</packagereq>
       <packagereq>xscreensaver-base</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
       <packagereq>NetworkManager-vpnc-gnome</packagereq>
       <packagereq>NetworkManager-l2tp</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
-      <packagereq>NetworkManager-wifi</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
       <packagereq>adwaita-gtk3-theme</packagereq>
       <packagereq>greybird-gtk2-theme</packagereq>
       <packagereq>greybird-gtk3-theme</packagereq>
       <packagereq>greybird-xfce4-notifyd-theme</packagereq>
       <packagereq>greybird-xfwm4-theme</packagereq>
       <packagereq>albatross-gtk2-theme</packagereq>
       <packagereq>albatross-gtk3-theme</packagereq>
       <packagereq>albatross-xfwm4-theme</packagereq>
       <packagereq>bluebird-gtk2-theme</packagereq>
       <packagereq>bluebird-gtk3-theme</packagereq>
       <packagereq>bluebird-xfwm4-theme</packagereq>
       <packagereq>thunar-media-tags-plugin</packagereq>
       <packagereq>xfce4-datetime-plugin</packagereq>
       <packagereq>xfce4-places-plugin</packagereq>
       <packagereq>xfce4-quicklauncher-plugin</packagereq>
       <packagereq>xfce4-screenshooter-plugin</packagereq>
       <packagereq>xfwm4-themes</packagereq>
@@ -595,41 +592,40 @@
       <packagereq>lxrandr</packagereq>
       <packagereq>lxsession-edit</packagereq>
       <packagereq>lxshortcut</packagereq>
       <packagereq>lxtask</packagereq>
       <packagereq>lxterminal</packagereq>
       <packagereq>obconf</packagereq>
       <packagereq>openssh-askpass</packagereq>
       <packagereq>xarchiver</packagereq>
       <packagereq>xscreensaver-base</packagereq>
       <packagereq>clipit</packagereq>
       <packagereq>galculator</packagereq>
       <packagereq>xpad</packagereq>
       <packagereq>gigolo</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
       <packagereq>adwaita-gtk3-theme</packagereq>
       <packagereq>gnome-keyring-pam</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>nm-connection-editor</packagereq>
-      <packagereq>NetworkManager-wifi</packagereq>
       <packagereq>perl-File-MimeInfo</packagereq>
       <packagereq>xcompmgr</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>xscreensaver-extras</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>notification-daemon</packagereq>
       <packagereq>upower</packagereq>
     </packagelist>
   </group>
   <group>
     <id>lxde-apps</id>
     <_name>Applications for the LXDE Desktop</_name>
     <_description>A set of commonly used applications for the LXDE Desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>midori</packagereq>
       <packagereq>pidgin</packagereq>
       <packagereq>sylpheed</packagereq>
       <packagereq>transmission</packagereq>
@@ -721,41 +717,40 @@
       <packagereq>evince</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>icedtea-web</packagereq>
       <packagereq>thunderbird</packagereq>
       <packagereq>brasero</packagereq>
       <packagereq>totem</packagereq>
       <packagereq>totem-mozplugin</packagereq>
       <packagereq>lightdm-gtk</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>gedit</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>imsettings-cinnamon</packagereq>
       <packagereq>nemo-fileroller</packagereq>
       <packagereq>nemo-preview</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>NetworkManager-l2tp</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
-      <packagereq>NetworkManager-wifi</packagereq>
       <packagereq>nm-connection-editor</packagereq>
       <packagereq>gnome-backgrounds</packagereq>
       <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-disk-utility</packagereq>
       <packagereq>gnome-icon-theme</packagereq>
       <packagereq>gnome-icon-theme-extras</packagereq>
       <packagereq>gnome-icon-theme-legacy</packagereq>
       <packagereq>gnome-icon-theme-symbolic</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>gnome-screenshot</packagereq>
       <packagereq>cinnamon-screensaver</packagereq>
       <packagereq>gnome-system-monitor</packagereq>
       <packagereq>gnome-terminal</packagereq>
       <packagereq>gvfs-archive</packagereq>
       <packagereq>gvfs-gphoto2</packagereq>
       <packagereq>gvfs-smb</packagereq>
       <packagereq>gvfs-mtp</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>policycoreutils-gui</packagereq>
@@ -1849,40 +1844,41 @@
       <packagereq type="optional">geany</packagereq>
       <packagereq type="optional">syntastic-d</packagereq>
       <packagereq type="optional">gl3n-devel</packagereq>
       <packagereq type="optional">derelict-devel</packagereq>
       <packagereq type="optional">tango-devel</packagereq>
     </packagelist>
   </group>
   <group>
     <id>dial-up</id>
     <_name>Dial-up Networking Support</_name>
     <_description/>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">ppp</packagereq>
       <packagereq type="default">isdn4k-utils</packagereq>
       <packagereq type="default">linux-atm</packagereq>
       <packagereq type="default">lrzsz</packagereq>
       <packagereq type="default">minicom</packagereq>
       <packagereq type="default">ModemManager</packagereq>
+      <packagereq type="default">NetworkManager-adsl</packagereq>
       <packagereq type="default">rp-pppoe</packagereq>
       <packagereq type="default">wvdial</packagereq>
       <packagereq type="optional">efax</packagereq>
       <packagereq type="optional">pptp</packagereq>
       <packagereq type="optional">statserial</packagereq>
     </packagelist>
   </group>
   <group>
     <id>directory-server</id>
     <_name>Directory Server</_name>
     <_description>Machine and user identity servers.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="optional">389-admin-console</packagereq>
       <packagereq type="optional">389-console</packagereq>
       <packagereq type="optional">389-ds-base</packagereq>
       <packagereq type="optional">389-ds-console</packagereq>
       <packagereq type="optional">389-dsgw</packagereq>
       <packagereq type="optional">idm-console-framework</packagereq>
@@ -4425,41 +4421,40 @@
       <packagereq>mate-polkit</packagereq>
       <packagereq>mate-power-manager</packagereq>
       <packagereq>mate-screensaver</packagereq>
       <packagereq>mate-screenshot</packagereq>
       <packagereq>mate-search-tool</packagereq>
       <packagereq>mate-session-manager</packagereq>
       <packagereq>mate-settings-daemon</packagereq>
       <packagereq>mate-system-log</packagereq>
       <packagereq>mate-system-monitor</packagereq>
       <packagereq>mate-terminal</packagereq>
       <packagereq>mate-themes</packagereq>
       <packagereq>mozo</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>NetworkManager-l2tp</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
       <packagereq>NetworkManager-vpnc-gnome</packagereq>
-      <packagereq>NetworkManager-wifi</packagereq>
       <packagereq>pidgin</packagereq>
       <packagereq>pluma</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-users</packagereq>
       <packagereq>transmission-gtk</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>xfburn</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq>yumex</packagereq>
     </packagelist>
    </group>
   <group>
     <id>mate-applications</id>
     <_name>MATE Applications</_name>
     <_description>Applications for the MATE Desktop.</_description>
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
@@ -4690,40 +4685,55 @@
       <packagereq type="optional">oidentd</packagereq>
       <packagereq type="optional">openldap-servers</packagereq>
       <packagereq type="optional">polipo</packagereq>
       <packagereq type="optional">privoxy</packagereq>
       <packagereq type="optional">puppet-server</packagereq>
       <packagereq type="optional">quagga</packagereq>
       <packagereq type="optional">radvd</packagereq>
       <packagereq type="optional">rinetd</packagereq>
       <packagereq type="optional">sobby</packagereq>
       <packagereq type="optional">tigervnc-server</packagereq>
       <packagereq type="optional">torque-server</packagereq>
       <packagereq type="optional">ucarp</packagereq>
       <packagereq type="optional">vnc-reflector</packagereq>
       <packagereq type="optional">vtun</packagereq>
       <packagereq type="optional">xl2tpd</packagereq>
       <packagereq type="optional">ypserv</packagereq>
       <packagereq type="optional">znc</packagereq>
     </packagelist>
   </group>
   <group>
+    <id>networkmanager-submodules</id>
+    <_name>Common NetworkManager submodules</_name>
+    <_description>
+      This group contains NetworkManager submodules that are commonly used,
+      but may not be wanted in some streamlined configurations.
+    </_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">NetworkManager-wifi</packagereq>
+      <packagereq type="default">NetworkManager-bluetooth</packagereq>
+      <packagereq type="default">NetworkManager-wwan</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>news-server</id>
     <_name>News Server</_name>
     <_description>This group allows you to configure the system as a news server.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">inn</packagereq>
       <packagereq type="optional">cleanfeed</packagereq>
       <packagereq type="optional">leafnode</packagereq>
       <packagereq type="optional">newscache</packagereq>
       <packagereq type="optional">newsx</packagereq>
       <packagereq type="optional">suck</packagereq>
     </packagelist>
   </group>
   <group>
     <id>ocaml</id>
     <_name>OCaml</_name>
     <_description>
       Support for developing software using the
       Objective CAML programming language and libraries.
@@ -6237,217 +6247,225 @@
       <packagereq type="default">RepetierHost</packagereq>
       <packagereq type="default">repsnapper</packagereq>
       <packagereq type="default">sfact</packagereq>
       <packagereq type="default">skeinforge</packagereq>
       <packagereq type="default">slic3r</packagereq>
     </packagelist>
   </group>
   <environment>
     <id>gnome-desktop-environment</id>
     <_name>GNOME Desktop</_name>
     <_description>GNOME is a highly intuitive and user friendly desktop environment.</_description>
     <display_order>5</display_order>
     <grouplist>
       <groupid>base-x</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
       <groupid>firefox</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>gnome-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid default="true">libreoffice</groupid>
       <groupid>gnome-games</groupid>
       <groupid>epiphany</groupid>
       <groupid>3d-printing</groupid>
     </optionlist>
   </environment>
   <environment>
     <id>kde-desktop-environment</id>
     <_name>KDE Plasma Workspaces</_name>
     <_description>The KDE Plasma Workspaces, a highly-configurable graphical user interface which includes a panel, desktop, system icons and desktop widgets, and many powerful KDE applications.</_description>
     <display_order>10</display_order>
     <grouplist>
       <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>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>kde-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>kde-apps</groupid>
       <groupid>kde-education</groupid>
       <groupid>kde-media</groupid>
       <groupid>kde-office</groupid>
       <groupid>kde-telepathy</groupid>
       <groupid>3d-printing</groupid>
     </optionlist>
   </environment>
   <environment>
     <id>xfce-desktop-environment</id>
     <_name>Xfce Desktop</_name>
     <_description>A lightweight desktop environment that works well on low end machines.</_description>
     <display_order>15</display_order>
     <grouplist>
       <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>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>xfce-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid default="true">xfce-apps</groupid>
       <groupid default="true">xfce-media</groupid>
       <groupid>xfce-extra-plugins</groupid>
       <groupid>xfce-office</groupid>
       <groupid>3d-printing</groupid>
     </optionlist>
   </environment>
   <environment>
     <id>lxde-desktop-environment</id>
     <_name>LXDE Desktop</_name>
     <_description>LXDE is a lightweight X11 desktop environment designed for computers with low hardware specifications like netbooks, mobile devices or older computers.</_description>
     <display_order>20</display_order>
     <grouplist>
       <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>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>lxde-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>lxde-apps</groupid>
       <groupid>lxde-media</groupid>
       <groupid>lxde-office</groupid>
       <groupid>3d-printing</groupid>
     </optionlist>
   </environment>
   <environment>
     <id>cinnamon-desktop-environment</id>
     <_name>Cinnamon Desktop</_name>
     <_description>Cinnamon provides a desktop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
     <display_order>21</display_order>
     <grouplist>
       <groupid>base-x</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>cinnamon-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>libreoffice</groupid>
       <groupid>3d-printing</groupid>
     </optionlist>
   </environment>
   <environment>
     <id>mate-desktop-environment</id>
     <_name>MATE Desktop</_name>
     <_description>MATE Desktop is based on GNOME 2 and provides a powerful graphical user interface for users who seek a simple easy to use traditional desktop interface.</_description>
     <display_order>22</display_order>
     <grouplist>
       <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>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>mate-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>mate-applications</groupid>
       <groupid>mate-compiz</groupid>
       <groupid>libreoffice</groupid>
       <groupid>3d-printing</groupid>
     </optionlist>
   </environment>
   <environment>
     <id>sugar-desktop-environment</id>
     <_name>Sugar Desktop Environment</_name>
     <_description>A software playground for learning about learning.</_description>
     <display_order>25</display_order>
     <grouplist>
       <groupid>base-x</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>hardware-support</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>sugar-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>sugar-apps</groupid>
     </optionlist>
   </environment>
   <environment>
     <id>developer-workstation-environment</id>
     <_name>Development and Creative Workstation</_name>
     <_description>Workstation for software, hardware, graphics, or content development.</_description>
     <display_order>35</display_order>
     <grouplist>
       <groupid>base-x</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>hardware-support</groupid>
       <groupid>printing</groupid>
       <groupid>firefox</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>eclipse</groupid>
       <groupid>development-libs</groupid>
       <groupid>development-tools</groupid>
       <groupid>rpm-development-tools</groupid>
       <groupid>c-development</groupid>
       <groupid>fedora-packager</groupid>
       <groupid>gnome-software-development</groupid>
       <groupid>kde-software-development</groupid>
       <groupid>kf5-software-development</groupid>
       <groupid>x-software-development</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>virtualization</groupid>
       <groupid>web-server</groupid>
     </grouplist>
     <optionlist>
       <groupid>java-development</groupid>
@@ -6520,40 +6538,41 @@
       <groupid>virtualization</groupid>
       <groupid>web-server</groupid>
       <groupid>load-balancer</groupid>
       <groupid>ha</groupid>
       <groupid>guest-agents</groupid>
     </optionlist>
   </environment>
   <environment>
     <id>basic-desktop-environment</id>
     <_name>Basic Desktop</_name>
     <_description>X Window System with a choice of window manager.</_description>
     <display_order>70</display_order>
     <grouplist>
       <groupid>base-x</groupid>
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>guest-desktop-agents</groupid>
       <groupid>basic-desktop</groupid>
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>
       <groupid>cinnamon-desktop</groupid>
       <groupid>gnome-desktop</groupid>
       <groupid>input-methods</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>libreoffice</groupid>
       <groupid>lxde-desktop</groupid>
       <groupid>mate-desktop</groupid>
       <groupid>sugar-desktop</groupid>
       <groupid>xfce-desktop</groupid>
       <groupid>xmonad</groupid>
       <groupid>xmonad-mate</groupid>
     </optionlist>
   </environment>
   <environment>
@@ -6747,40 +6766,41 @@
       <groupid>rubyonrails</groupid>
       <groupid>server-cfg</groupid>
       <groupid>smb-server</groupid>
       <groupid>sql-server</groupid>
       <groupid>tomcat</groupid>
       <groupid>virtualization</groupid>
       <groupid>web-server</groupid>
     </grouplist>
   </category>
   <category>
     <id>base-system</id>
     <_name>Base System</_name>
     <_description>Various core pieces of the system.</_description>
     <display_order>99</display_order>
     <grouplist>
       <groupid>admin-tools</groupid>
       <groupid>standard</groupid>
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
+      <groupid>networkmanager-submodules</groupid>
       <groupid>input-methods</groupid>
       <groupid>java</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>legacy-software-support</groupid>
       <groupid>system-tools</groupid>
       <groupid>virtualization</groupid>
     </grouplist>
   </category>
   <category>
     <id>content</id>
     <_name>Content</_name>
     <_description>Text and other Free content.</_description>
     <display_order>99</display_order>
     <grouplist>
       <groupid>books</groupid>
     </grouplist>
   </category>
   <langpacks>
     <match install="LabPlot-doc-%s" name="LabPlot-doc"/>
     <match install="aspell-%s" name="aspell"/>
-- 
2.0.0
-- 
Adam Williamson
Fedora QA Community Monkey
IRC: adamw | Twitter: AdamW_Fedora | XMPP: adamw AT happyassassin . net
http://www.happyassassin.net



More information about the devel mailing list