#541 Add ELN Environment to comps
Closed 3 years ago by sgallagh. Opened 3 years ago by sgallagh.
sgallagh/fedora-comps eln-release  into  master

file modified
+33 -33
@@ -2,6 +2,17 @@ 

  <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">

  <comps>

    <group>

+     <id>critical-path-kde</id>

+     <_name>Critical Path (KDE)</_name>

+     <_description>A set of packages that provide the Critical Path functionality for the KDE desktop</_description>

+     <default>false</default>

+     <uservisible>false</uservisible>

+     <packagelist>

+       <packagereq type="mandatory">kdelibs</packagereq>

+       <packagereq type="mandatory">sddm</packagereq>

+     </packagelist>

+   </group>

+   <group>

      <id>fedora-packager</id>

      <_name>Fedora Packager</_name>

      <_description>Tools and utilities needed by a Fedora Packager.</_description>
@@ -20,17 +31,6 @@ 

      </packagelist>

    </group>

    <group>

-     <id>critical-path-kde</id>

-     <_name>Critical Path (KDE)</_name>

-     <_description>A set of packages that provide the Critical Path functionality for the KDE desktop</_description>

-     <default>false</default>

-     <uservisible>false</uservisible>

-     <packagelist>

-       <packagereq type="mandatory">kdelibs</packagereq>

-       <packagereq type="mandatory">sddm</packagereq>

-     </packagelist>

-   </group>

-   <group>

      <id>kde-apps</id>

      <_name>KDE Applications</_name>

      <_description>A set of commonly used KDE applications</_description>
@@ -286,29 +286,29 @@ 

      <default>false</default>

      <uservisible>true</uservisible>

      <packagelist>

-        <packagereq type="mandatory">Thunar</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">mousepad</packagereq>

-        <packagereq type="default">NetworkManager-gnome</packagereq>

-        <packagereq type="default">openssh-askpass</packagereq>

-        <packagereq type="default">xfce-polkit</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-power-manager</packagereq>

-        <packagereq type="default">xfce4-pulseaudio-plugin</packagereq>

-        <packagereq type="default">xfce4-screensaver</packagereq>

-        <packagereq type="default">xfce4-terminal</packagereq>

+       <packagereq type="mandatory">Thunar</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">mousepad</packagereq>

+       <packagereq type="default">NetworkManager-gnome</packagereq>

+       <packagereq type="default">openssh-askpass</packagereq>

+       <packagereq type="default">thunar-archive-plugin</packagereq>

+       <packagereq type="default">thunar-volman</packagereq>

+       <packagereq type="default">tumbler</packagereq>

+       <packagereq type="default">xfce-polkit</packagereq>

+       <packagereq type="default">xfce4-appfinder</packagereq>

+       <packagereq type="default">xfce4-power-manager</packagereq>

+       <packagereq type="default">xfce4-pulseaudio-plugin</packagereq>

+       <packagereq type="default">xfce4-screensaver</packagereq>

+       <packagereq type="default">xfce4-terminal</packagereq>

      </packagelist>

-    </group>

+   </group>

    <environment>

      <id>kde-desktop-environment</id>

      <_name>KDE Plasma Workspaces</_name>

file modified
+11 -11
@@ -875,6 +875,7 @@ 

      <default>false</default>

      <uservisible>true</uservisible>

      <packagelist>

+       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-data-extras</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dbp</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dds-plugin</packagereq>
@@ -897,7 +898,6 @@ 

        <packagereq type="conditional" requires="inkscape">inkscape-psd</packagereq>

        <packagereq type="conditional" requires="inkscape">inkscape-sozi</packagereq>

        <packagereq type="conditional" requires="inkscape">inkscape-table</packagereq>

-       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>

        <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>

        <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
@@ -4788,11 +4788,11 @@ 

        <packagereq type="default">player-doc</packagereq>

        <packagereq type="default">player-examples</packagereq>

        <packagereq type="default">player-stage</packagereq>

-       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-bloom</packagereq>

        <packagereq type="default">python3-catkin_lint</packagereq>

        <packagereq type="default">python3-catkin_pkg</packagereq>

        <packagereq type="default">python3-catkin_tools</packagereq>

+       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-rosdep</packagereq>

        <packagereq type="default">python3-rosdistro</packagereq>

        <packagereq type="default">python3-rosinstall</packagereq>
@@ -6724,6 +6724,15 @@ 

      </grouplist>

    </category>

    <category>

+     <id>neuroscience</id>

+     <_name>Neuroscience</_name>

+     <_description>Tools for Neuroscience.</_description>

+     <display_order>120</display_order>

+     <grouplist>

+       <groupid>neuron-modelling-simulators</groupid>

+     </grouplist>

+   </category>

+   <category>

      <id>xfce-desktop-environment</id>

      <_name>Xfce Desktop</_name>

      <_description>A lightweight desktop environment that works well on low end machines.</_description>
@@ -6943,15 +6952,6 @@ 

        <groupid>books</groupid>

      </grouplist>

    </category>

-   <category>

-     <id>neuroscience</id>

-     <_name>Neuroscience</_name>

-     <_description>Tools for Neuroscience.</_description>

-     <display_order>120</display_order>

-     <grouplist>

-       <groupid>neuron-modelling-simulators</groupid>

-     </grouplist>

-   </category>

    <langpacks>

      <match install="LabPlot-doc-%s" name="LabPlot-doc"/>

      <match install="aspell-%s" name="aspell"/>

file modified
+96 -96
@@ -116,17 +116,6 @@ 

      </packagelist>

    </group>

    <group>

-     <id>x86-baremetal-tools</id>

-     <_name>x86 Baremetal Tools</_name>

-     <_description>Tools for working with baremetal x86 systems</_description>

-     <default>false</default>

-     <uservisible>false</uservisible>

-     <packagelist>

-       <packagereq>memtest86+</packagereq>

-       <packagereq>syslinux</packagereq>

-     </packagelist>

-   </group>

-   <group>

      <id>audio</id>

      <_name>Audio Production</_name>

      <_description>Various tools for audio synthesis and music production.</_description>
@@ -304,6 +293,7 @@ 

        <packagereq>mesa-dri-drivers</packagereq>

        <packagereq>mesa-vulkan-drivers</packagereq>

        <packagereq>plymouth-system-theme</packagereq>

+       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>

        <packagereq>xorg-x11-drv-armsoc</packagereq>

        <packagereq>xorg-x11-drv-ati</packagereq>

        <packagereq>xorg-x11-drv-evdev</packagereq>
@@ -322,7 +312,6 @@ 

        <packagereq>xorg-x11-xauth</packagereq>

        <packagereq>xorg-x11-xinit</packagereq>

        <packagereq type="optional">xorg-x11-drv-geode</packagereq>

-       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>

      </packagelist>

    </group>

    <group>
@@ -882,6 +871,7 @@ 

      <default>false</default>

      <uservisible>true</uservisible>

      <packagelist>

+       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-data-extras</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dbp</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dds-plugin</packagereq>
@@ -904,7 +894,6 @@ 

        <packagereq type="conditional" requires="inkscape">inkscape-psd</packagereq>

        <packagereq type="conditional" requires="inkscape">inkscape-sozi</packagereq>

        <packagereq type="conditional" requires="inkscape">inkscape-table</packagereq>

-       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>

        <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>

        <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
@@ -1943,7 +1932,6 @@ 

        <!-- <packagereq type="optional">google-noto-cjk-fonts</packagereq> -->

        <packagereq type="optional">google-noto-emoji-fonts</packagereq>

        <packagereq type="optional">google-noto-kufi-arabic-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-naskh-arabic-fonts</packagereq>

        <packagereq type="optional">google-noto-naskh-arabic-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-nastaliq-urdu-fonts</packagereq>
@@ -1952,8 +1940,8 @@ 

        <packagereq type="optional">google-noto-sans-balinese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-bamum-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-batak-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-bengali-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-buginese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-buhid-fonts</packagereq>
@@ -1969,11 +1957,10 @@ 

        <packagereq type="optional">google-noto-sans-cuneiform-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-cypriot-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-devanagari-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ethiopic-vf-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-georgian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-glagolitic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-gothic-fonts</packagereq>
@@ -1988,23 +1975,23 @@ 

        <packagereq type="optional">google-noto-sans-javanese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-jp-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kannada-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-khmer-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kr-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lao-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lepcha-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-limbu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-linear-b-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lisu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lydian-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-malayalam-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mandaic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-meetei-mayek-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mongolian-fonts</packagereq>
@@ -2012,8 +1999,9 @@ 

        <packagereq type="optional">google-noto-sans-mono-cjk-kr-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mono-cjk-sc-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mono-cjk-tc-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-myanmar-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-new-tai-lue-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-nko-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ogham-fonts</packagereq>
@@ -2044,19 +2032,20 @@ 

        <packagereq type="optional">google-noto-sans-tai-le-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tai-tham-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tai-viet-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tamil-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-telugu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-thaana-vf-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-thai-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tibetan-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tifinagh-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-yi-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-armenian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-bengali-fonts</packagereq>
@@ -2066,7 +2055,6 @@ 

        <packagereq type="optional">google-noto-serif-cjk-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-cjk-ttc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-devanagari-fonts</packagereq>

-       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-georgian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-gujarati-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-jp-fonts</packagereq>
@@ -2080,6 +2068,7 @@ 

        <packagereq type="optional">google-noto-serif-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-telugu-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-thai-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>

        <packagereq type="optional">google-roboto-condensed-fonts</packagereq>

        <packagereq type="optional">google-roboto-fonts</packagereq>

        <packagereq type="optional">google-roboto-mono-fonts</packagereq>
@@ -4509,6 +4498,47 @@ 

      </packagelist>

    </group>

    <group>

+     <id>pantheon-apps</id>

+     <_name>Pantheon Apps</_name>

+     <_description>The apps for Pantheo de</_description>

+     <default>false</default>

+     <uservisible>false</uservisible>

+     <packagelist>

+       <packagereq type="default">elementary-calculator</packagereq>

+       <packagereq type="default">elementary-calendar</packagereq>

+       <packagereq type="default">elementary-camera</packagereq>

+       <packagereq type="default">elementary-code</packagereq>

+       <packagereq type="default">elementary-files</packagereq>

+       <packagereq type="default">elementary-icon-theme</packagereq>

+       <packagereq type="default">elementary-music</packagereq>

+       <packagereq type="default">elementary-photos</packagereq>

+       <packagereq type="default">elementary-print</packagereq>

+       <packagereq type="default">elementary-screenshot-tool</packagereq>

+       <packagereq type="default">elementary-sound-theme</packagereq>

+       <packagereq type="default">elementary-terminal</packagereq>

+       <packagereq type="default">elementary-theme</packagereq>

+       <packagereq type="default">elementary-videos</packagereq>

+       <packagereq type="default">elementary-wallpapers</packagereq>

+       <packagereq type="default">switchboard</packagereq>

+       <packagereq type="default">switchboard-plug-a11y</packagereq>

+       <packagereq type="default">switchboard-plug-about</packagereq>

+       <packagereq type="default">switchboard-plug-applications</packagereq>

+       <packagereq type="default">switchboard-plug-bluetooth</packagereq>

+       <packagereq type="default">switchboard-plug-display</packagereq>

+       <packagereq type="default">switchboard-plug-keyboard</packagereq>

+       <packagereq type="default">switchboard-plug-networking</packagereq>

+       <packagereq type="default">switchboard-plug-notifications</packagereq>

+       <packagereq type="default">switchboard-plug-onlineaccounts</packagereq>

+       <packagereq type="default">switchboard-plug-pantheon-shell</packagereq>

+       <packagereq type="default">switchboard-plug-printers</packagereq>

+       <packagereq type="default">switchboard-plug-sharing</packagereq>

+       <packagereq type="default">switchboard-plug-sound</packagereq>

+       <packagereq type="optional">elementary-capnet-assist</packagereq>

+       <packagereq type="optional">elementary-greeter</packagereq>

+       <packagereq type="optional">elementary-shortcut-overlay</packagereq>

+     </packagelist>

+   </group>

+   <group>

      <id>pantheon-desktop</id>

      <_name>Pantheon Desktop</_name>

      <_description>The Pantheon desktop environment is the DE that powers elementaryOS.</_description>
@@ -4538,47 +4568,6 @@ 

      </packagelist>

    </group>

    <group>

-   <id>pantheon-apps</id>

-   <_name>Pantheon Apps</_name>

-   <_description>The apps for Pantheo de</_description>

-   <default>false</default>

-   <uservisible>false</uservisible>

-       <packagelist>

-         <packagereq type="default">elementary-calculator</packagereq>

-         <packagereq type="default">elementary-calendar</packagereq>

-         <packagereq type="default">elementary-camera</packagereq>

-         <packagereq type="default">elementary-code</packagereq>

-         <packagereq type="default">elementary-files</packagereq>

-         <packagereq type="default">elementary-icon-theme</packagereq>

-         <packagereq type="default">elementary-music</packagereq>

-         <packagereq type="default">elementary-photos</packagereq>

-         <packagereq type="default">elementary-print</packagereq>

-         <packagereq type="default">elementary-screenshot-tool</packagereq>

-         <packagereq type="default">elementary-sound-theme</packagereq>

-         <packagereq type="default">elementary-terminal</packagereq>

-         <packagereq type="default">elementary-theme</packagereq>

-         <packagereq type="default">elementary-videos</packagereq>

-         <packagereq type="default">elementary-wallpapers</packagereq>

-         <packagereq type="default">switchboard</packagereq>

-         <packagereq type="default">switchboard-plug-a11y</packagereq>

-         <packagereq type="default">switchboard-plug-about</packagereq>

-         <packagereq type="default">switchboard-plug-applications</packagereq>

-         <packagereq type="default">switchboard-plug-bluetooth</packagereq>

-         <packagereq type="default">switchboard-plug-display</packagereq>

-         <packagereq type="default">switchboard-plug-keyboard</packagereq>

-         <packagereq type="default">switchboard-plug-networking</packagereq>

-         <packagereq type="default">switchboard-plug-notifications</packagereq>

-         <packagereq type="default">switchboard-plug-onlineaccounts</packagereq>

-         <packagereq type="default">switchboard-plug-pantheon-shell</packagereq>

-         <packagereq type="default">switchboard-plug-printers</packagereq>

-         <packagereq type="default">switchboard-plug-sharing</packagereq>

-         <packagereq type="default">switchboard-plug-sound</packagereq>

-         <packagereq type="optional">elementary-capnet-assist</packagereq>

-         <packagereq type="optional">elementary-greeter</packagereq>

-         <packagereq type="optional">elementary-shortcut-overlay</packagereq>

-       </packagelist>

-      </group>

-   <group>

      <id>perl</id>

      <_name>Perl Development</_name>

      <_description>Support for developing programs in the Perl programming language.</_description>
@@ -4761,8 +4750,6 @@ 

      <uservisible>true</uservisible>

      <packagelist>

        <packagereq type="default">arduino</packagereq>

-       <packagereq type="default">qtcreator</packagereq>

-       <packagereq type="default">git</packagereq>

        <packagereq type="default">fawkes</packagereq>

        <packagereq type="default">fawkes-core</packagereq>

        <packagereq type="default">fawkes-doc</packagereq>
@@ -4788,6 +4775,7 @@ 

        <packagereq type="default">gazebo</packagereq>

        <packagereq type="default">gazebo-doc</packagereq>

        <packagereq type="default">gearbox</packagereq>

+       <packagereq type="default">git</packagereq>

        <packagereq type="default">libphidget</packagereq>

        <packagereq type="default">mrpt-apps</packagereq>

        <packagereq type="default">mrpt-doc</packagereq>
@@ -4799,11 +4787,11 @@ 

        <packagereq type="default">player-doc</packagereq>

        <packagereq type="default">player-examples</packagereq>

        <packagereq type="default">player-stage</packagereq>

-       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-bloom</packagereq>

        <packagereq type="default">python3-catkin_lint</packagereq>

        <packagereq type="default">python3-catkin_pkg</packagereq>

        <packagereq type="default">python3-catkin_tools</packagereq>

+       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-rosdep</packagereq>

        <packagereq type="default">python3-rosdistro</packagereq>

        <packagereq type="default">python3-rosinstall</packagereq>
@@ -4811,6 +4799,7 @@ 

        <packagereq type="default">python3-rospkg</packagereq>

        <packagereq type="default">python3-vcstools</packagereq>

        <packagereq type="default">python3-wstool</packagereq>

+       <packagereq type="default">qtcreator</packagereq>

        <packagereq type="default">rcsslogplayer</packagereq>

        <packagereq type="default">rcssmonitor</packagereq>

        <packagereq type="default">rcssserver</packagereq>
@@ -6034,6 +6023,17 @@ 

      </packagelist>

    </group>

    <group>

+     <id>x86-baremetal-tools</id>

+     <_name>x86 Baremetal Tools</_name>

+     <_description>Tools for working with baremetal x86 systems</_description>

+     <default>false</default>

+     <uservisible>false</uservisible>

+     <packagelist>

+       <packagereq>memtest86+</packagereq>

+       <packagereq>syslinux</packagereq>

+     </packagelist>

+   </group>

+   <group>

      <id>xfce-apps</id>

      <_name>Applications for the Xfce Desktop</_name>

      <_description>A set of commonly used applications for the Xfce Desktop</_description>
@@ -6299,10 +6299,10 @@ 

      </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>

+     <id>pantheon-desktop-environment</id>

+     <_name>Pantheon Desktop Environment</_name>

+     <_description>The Panhteon DE powering elementary OS.</_description>

+     <display_order>10</display_order>

      <grouplist>

        <groupid>base-x</groupid>

        <groupid>standard</groupid>
@@ -6316,22 +6316,18 @@ 

        <groupid>hardware-support</groupid>

        <groupid>printing</groupid>

        <groupid>guest-desktop-agents</groupid>

-       <groupid>xfce-desktop</groupid>

+       <groupid>pantheon-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>

-       <groupid>cloud-management</groupid>

+       <groupid default="true">firefox</groupid>

+       <groupid default="true">pantheon-apps</groupid>

      </optionlist>

    </environment>

    <environment>

-     <id>pantheon-desktop-environment</id>

-     <_name>Pantheon Desktop Environment</_name>

-     <_description>The Panhteon DE powering elementary OS.</_description>

-     <display_order>10</display_order>

+     <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>
@@ -6345,11 +6341,15 @@ 

        <groupid>hardware-support</groupid>

        <groupid>printing</groupid>

        <groupid>guest-desktop-agents</groupid>

-       <groupid>pantheon-desktop</groupid>

+       <groupid>xfce-desktop</groupid>

      </grouplist>

      <optionlist>

-       <groupid default="true">firefox</groupid>

-       <groupid default="true">pantheon-apps</groupid>

+       <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>

+       <groupid>cloud-management</groupid>

      </optionlist>

    </environment>

    <environment>
@@ -6754,6 +6754,15 @@ 

      </grouplist>

    </category>

    <category>

+     <id>neuroscience</id>

+     <_name>Neuroscience</_name>

+     <_description>Tools for Neuroscience.</_description>

+     <display_order>120</display_order>

+     <grouplist>

+       <groupid>neuron-modelling-simulators</groupid>

+     </grouplist>

+   </category>

+   <category>

      <id>xfce-desktop-environment</id>

      <_name>Xfce Desktop</_name>

      <_description>A lightweight desktop environment that works well on low end machines.</_description>
@@ -6975,15 +6984,6 @@ 

        <groupid>books</groupid>

      </grouplist>

    </category>

-   <category>

-     <id>neuroscience</id>

-     <_name>Neuroscience</_name>

-     <_description>Tools for Neuroscience.</_description>

-     <display_order>120</display_order>

-     <grouplist>

-       <groupid>neuron-modelling-simulators</groupid>

-     </grouplist>

-   </category>

    <langpacks>

      <match install="LabPlot-doc-%s" name="LabPlot-doc"/>

      <match install="aspell-%s" name="aspell"/>

file modified
+47 -47
@@ -116,17 +116,6 @@ 

      </packagelist>

    </group>

    <group>

-     <id>x86-baremetal-tools</id>

-     <_name>x86 Baremetal Tools</_name>

-     <_description>Tools for working with baremetal x86 systems</_description>

-     <default>false</default>

-     <uservisible>false</uservisible>

-     <packagelist>

-       <packagereq>memtest86+</packagereq>

-       <packagereq>syslinux</packagereq>

-     </packagelist>

-   </group>

-   <group>

      <id>audio</id>

      <_name>Audio Production</_name>

      <_description>Various tools for audio synthesis and music production.</_description>
@@ -212,10 +201,10 @@ 

        <packagereq type="default">muse</packagereq>

        <packagereq type="default">nekobee-dssi</packagereq>

        <packagereq type="default">non-mixer</packagereq>

-       <packagereq type="default">non-session-manager</packagereq>

        <packagereq type="default">non-sequencer</packagereq>

-       <packagereq type="default">pulseaudio-module-jack</packagereq>

+       <packagereq type="default">non-session-manager</packagereq>

        <packagereq type="default">pavucontrol</packagereq>

+       <packagereq type="default">pulseaudio-module-jack</packagereq>

        <packagereq type="default">qastools</packagereq>

        <packagereq type="default">qjackctl</packagereq>

        <packagereq type="default">qmidiarp</packagereq>
@@ -300,6 +289,7 @@ 

        <packagereq>mesa-vulkan-drivers</packagereq>

        <packagereq>plymouth-system-theme</packagereq>

        <packagereq>xorg-x11-drv-amdgpu</packagereq>

+       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>

        <packagereq>xorg-x11-drv-armsoc</packagereq>

        <packagereq>xorg-x11-drv-ati</packagereq>

        <packagereq>xorg-x11-drv-evdev</packagereq>
@@ -318,7 +308,6 @@ 

        <packagereq>xorg-x11-xauth</packagereq>

        <packagereq>xorg-x11-xinit</packagereq>

        <packagereq type="optional">xorg-x11-drv-geode</packagereq>

-       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>

      </packagelist>

    </group>

    <group>
@@ -444,8 +433,8 @@ 

        <packagereq type="mandatory">abrt-desktop</packagereq>

        <packagereq type="mandatory">abrt-java-connector</packagereq>

        <packagereq type="mandatory">alsa-plugins-pulseaudio</packagereq>

-       <packagereq type="mandatory">cinnamon</packagereq>

        <packagereq type="mandatory">blueberry</packagereq>

+       <packagereq type="mandatory">cinnamon</packagereq>

        <packagereq type="mandatory">cinnamon-control-center</packagereq>

        <packagereq type="mandatory">cinnamon-screensaver</packagereq>

        <packagereq type="mandatory">dnfdragora-updater</packagereq>
@@ -553,10 +542,10 @@ 

        <packagereq type="mandatory">rsync</packagereq>

        <packagereq arch="i386,x86_64" type="mandatory">syslinux-extlinux</packagereq>

        <packagereq type="mandatory">tar</packagereq>

-       <packagereq type="default">fedora-release-cloud</packagereq>

        <packagereq type="default">console-login-helper-messages-issuegen</packagereq>

        <packagereq type="default">console-login-helper-messages-motdgen</packagereq>

        <packagereq type="default">console-login-helper-messages-profile</packagereq>

+       <packagereq type="default">fedora-release-cloud</packagereq>

      </packagelist>

    </group>

    <group>
@@ -882,6 +871,7 @@ 

      <default>false</default>

      <uservisible>true</uservisible>

      <packagelist>

+       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-data-extras</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dbp</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dds-plugin</packagereq>
@@ -903,7 +893,6 @@ 

        <packagereq type="conditional" requires="inkscape">inkscape-psd</packagereq>

        <packagereq type="conditional" requires="inkscape">inkscape-sozi</packagereq>

        <packagereq type="conditional" requires="inkscape">inkscape-table</packagereq>

-       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>

        <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>

        <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
@@ -1940,7 +1929,6 @@ 

        <!-- <packagereq type="optional">google-noto-cjk-fonts</packagereq> -->

        <packagereq type="optional">google-noto-emoji-fonts</packagereq>

        <packagereq type="optional">google-noto-kufi-arabic-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-naskh-arabic-fonts</packagereq>

        <packagereq type="optional">google-noto-naskh-arabic-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-nastaliq-urdu-fonts</packagereq>
@@ -1949,8 +1937,8 @@ 

        <packagereq type="optional">google-noto-sans-balinese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-bamum-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-batak-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-bengali-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-buginese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-buhid-fonts</packagereq>
@@ -1966,11 +1954,10 @@ 

        <packagereq type="optional">google-noto-sans-cuneiform-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-cypriot-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-devanagari-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ethiopic-vf-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-georgian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-glagolitic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-gothic-fonts</packagereq>
@@ -1985,23 +1972,23 @@ 

        <packagereq type="optional">google-noto-sans-javanese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-jp-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kannada-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-khmer-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kr-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lao-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lepcha-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-limbu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-linear-b-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lisu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lydian-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-malayalam-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mandaic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-meetei-mayek-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mongolian-fonts</packagereq>
@@ -2009,8 +1996,9 @@ 

        <packagereq type="optional">google-noto-sans-mono-cjk-kr-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mono-cjk-sc-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mono-cjk-tc-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-myanmar-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-new-tai-lue-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-nko-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ogham-fonts</packagereq>
@@ -2041,19 +2029,20 @@ 

        <packagereq type="optional">google-noto-sans-tai-le-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tai-tham-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tai-viet-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tamil-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-telugu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-thaana-vf-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-thai-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tibetan-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tifinagh-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-yi-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-armenian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-bengali-fonts</packagereq>
@@ -2063,7 +2052,6 @@ 

        <packagereq type="optional">google-noto-serif-cjk-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-cjk-ttc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-devanagari-fonts</packagereq>

-       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-georgian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-gujarati-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-jp-fonts</packagereq>
@@ -2077,6 +2065,7 @@ 

        <packagereq type="optional">google-noto-serif-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-telugu-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-thai-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>

        <packagereq type="optional">google-roboto-condensed-fonts</packagereq>

        <packagereq type="optional">google-roboto-fonts</packagereq>

        <packagereq type="optional">google-roboto-mono-fonts</packagereq>
@@ -3049,6 +3038,7 @@ 

      <default>false</default>

      <uservisible>false</uservisible>

      <packagelist>

+       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>

        <packagereq type="default">atmel-firmware</packagereq>

        <packagereq type="default">b43-fwcutter</packagereq>

        <packagereq type="default">b43-openfwwf</packagereq>
@@ -3073,7 +3063,6 @@ 

        <packagereq type="default">libertas-usb8388-firmware</packagereq>

        <packagereq type="default">usb_modeswitch</packagereq>

        <packagereq type="default">zd1211-firmware</packagereq>

-       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>

        <packagereq type="optional">acpi</packagereq>

        <packagereq type="optional">acpitool</packagereq>

        <packagereq type="optional">alsa-firmware</packagereq>
@@ -4748,8 +4737,6 @@ 

      <uservisible>true</uservisible>

      <packagelist>

        <packagereq type="default">arduino</packagereq>

-       <packagereq type="default">qtcreator</packagereq>

-       <packagereq type="default">git</packagereq>

        <packagereq type="default">fawkes</packagereq>

        <packagereq type="default">fawkes-core</packagereq>

        <packagereq type="default">fawkes-doc</packagereq>
@@ -4775,6 +4762,7 @@ 

        <packagereq type="default">gazebo</packagereq>

        <packagereq type="default">gazebo-doc</packagereq>

        <packagereq type="default">gearbox</packagereq>

+       <packagereq type="default">git</packagereq>

        <packagereq type="default">libphidget</packagereq>

        <packagereq type="default">mrpt-apps</packagereq>

        <packagereq type="default">mrpt-doc</packagereq>
@@ -4786,11 +4774,11 @@ 

        <packagereq type="default">player-doc</packagereq>

        <packagereq type="default">player-examples</packagereq>

        <packagereq type="default">player-stage</packagereq>

-       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-bloom</packagereq>

        <packagereq type="default">python3-catkin_lint</packagereq>

        <packagereq type="default">python3-catkin_pkg</packagereq>

        <packagereq type="default">python3-catkin_tools</packagereq>

+       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-rosdep</packagereq>

        <packagereq type="default">python3-rosdistro</packagereq>

        <packagereq type="default">python3-rosinstall</packagereq>
@@ -4798,6 +4786,7 @@ 

        <packagereq type="default">python3-rospkg</packagereq>

        <packagereq type="default">python3-vcstools</packagereq>

        <packagereq type="default">python3-wstool</packagereq>

+       <packagereq type="default">qtcreator</packagereq>

        <packagereq type="default">rcsslogplayer</packagereq>

        <packagereq type="default">rcssmonitor</packagereq>

        <packagereq type="default">rcssserver</packagereq>
@@ -5406,10 +5395,10 @@ 

        <packagereq>alsa-plugins-pulseaudio</packagereq>

        <packagereq>alsa-utils</packagereq>

        <packagereq>gnome-power-manager</packagereq>

+       <packagereq>gstreamer-plugins-espeak</packagereq>

+       <packagereq>gstreamer1-plugins-bad-free</packagereq>

        <packagereq>gstreamer1-plugins-base</packagereq>

        <packagereq>gstreamer1-plugins-good</packagereq>

-       <packagereq>gstreamer1-plugins-bad-free</packagereq>

-       <packagereq>gstreamer-plugins-espeak</packagereq>

        <packagereq>gvfs</packagereq>

        <packagereq>lightdm</packagereq>

        <packagereq>lightdm-gtk</packagereq>
@@ -5417,20 +5406,20 @@ 

        <packagereq>pulseaudio</packagereq>

        <packagereq>pulseaudio-utils</packagereq>

        <packagereq>sugar</packagereq>

-       <packagereq>sugar-logos</packagereq>

-       <packagereq>sugar-cp-updater</packagereq>

        <packagereq>sugar-abacus</packagereq>

        <packagereq>sugar-browse</packagereq>

        <packagereq>sugar-calculator</packagereq>

        <packagereq>sugar-chat</packagereq>

        <packagereq>sugar-clock</packagereq>

        <packagereq>sugar-cp-all</packagereq>

+       <packagereq>sugar-cp-updater</packagereq>

        <packagereq>sugar-finance</packagereq>

        <packagereq>sugar-fototoon</packagereq>

        <packagereq>sugar-imageviewer</packagereq>

        <packagereq>sugar-implode</packagereq>

        <packagereq>sugar-jukebox</packagereq>

        <packagereq>sugar-log</packagereq>

+       <packagereq>sugar-logos</packagereq>

        <packagereq>sugar-maze</packagereq>

        <packagereq>sugar-memorize</packagereq>

        <packagereq>sugar-moon</packagereq>
@@ -6026,6 +6015,17 @@ 

      </packagelist>

    </group>

    <group>

+     <id>x86-baremetal-tools</id>

+     <_name>x86 Baremetal Tools</_name>

+     <_description>Tools for working with baremetal x86 systems</_description>

+     <default>false</default>

+     <uservisible>false</uservisible>

+     <packagelist>

+       <packagereq>memtest86+</packagereq>

+       <packagereq>syslinux</packagereq>

+     </packagelist>

+   </group>

+   <group>

      <id>xfce-apps</id>

      <_name>Applications for the Xfce Desktop</_name>

      <_description>A set of commonly used applications for the Xfce Desktop</_description>
@@ -6087,8 +6087,8 @@ 

        <packagereq>fedora-icon-theme</packagereq>

        <packagereq>firewall-config</packagereq>

        <packagereq>gnome-keyring-pam</packagereq>

-       <packagereq>greybird-light-theme</packagereq>

        <packagereq>greybird-dark-theme</packagereq>

+       <packagereq>greybird-light-theme</packagereq>

        <packagereq>greybird-xfce4-notifyd-theme</packagereq>

        <packagereq>greybird-xfwm4-theme</packagereq>

        <packagereq>gtk-xfce-engine</packagereq>
@@ -6723,6 +6723,15 @@ 

      </grouplist>

    </category>

    <category>

+     <id>neuroscience</id>

+     <_name>Neuroscience</_name>

+     <_description>Tools for Neuroscience.</_description>

+     <display_order>120</display_order>

+     <grouplist>

+       <groupid>neuron-modelling-simulators</groupid>

+     </grouplist>

+   </category>

+   <category>

      <id>xfce-desktop-environment</id>

      <_name>Xfce Desktop</_name>

      <_description>A lightweight desktop environment that works well on low end machines.</_description>
@@ -6944,15 +6953,6 @@ 

        <groupid>books</groupid>

      </grouplist>

    </category>

-   <category>

-     <id>neuroscience</id>

-     <_name>Neuroscience</_name>

-     <_description>Tools for Neuroscience.</_description>

-     <display_order>120</display_order>

-     <grouplist>

-       <groupid>neuron-modelling-simulators</groupid>

-     </grouplist>

-   </category>

    <langpacks>

      <match install="LabPlot-doc-%s" name="LabPlot-doc"/>

      <match install="aspell-%s" name="aspell"/>

file modified
+64 -64
@@ -1,4 +1,4 @@ 

- <?xml version='1.0' encoding='UTF-8'?>

+ <?xml version="1.0" encoding="UTF-8"?>

  <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">

  <comps>

    <group>
@@ -114,17 +114,6 @@ 

      </packagelist>

    </group>

    <group>

-     <id>x86-baremetal-tools</id>

-     <_name>x86 Baremetal Tools</_name>

-     <_description>Tools for working with baremetal x86 systems</_description>

-     <default>false</default>

-     <uservisible>false</uservisible>

-     <packagelist>

-       <packagereq>memtest86+</packagereq>

-       <packagereq>syslinux</packagereq>

-     </packagelist>

-   </group>

-   <group>

      <id>audio</id>

      <_name>Audio Production</_name>

      <_description>Various tools for audio synthesis and music production.</_description>
@@ -208,8 +197,8 @@ 

        <packagereq type="default">mup</packagereq>

        <packagereq type="default">muse</packagereq>

        <packagereq type="default">new-session-manager</packagereq>

-       <packagereq type="default">pulseaudio-module-jack</packagereq>

        <packagereq type="default">pavucontrol</packagereq>

+       <packagereq type="default">pulseaudio-module-jack</packagereq>

        <packagereq type="default">qastools</packagereq>

        <packagereq type="default">qjackctl</packagereq>

        <packagereq type="default">qmidiarp</packagereq>
@@ -294,6 +283,7 @@ 

        <packagereq>mesa-vulkan-drivers</packagereq>

        <packagereq>plymouth-system-theme</packagereq>

        <packagereq>xorg-x11-drv-amdgpu</packagereq>

+       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>

        <packagereq>xorg-x11-drv-armsoc</packagereq>

        <packagereq>xorg-x11-drv-ati</packagereq>

        <packagereq>xorg-x11-drv-evdev</packagereq>
@@ -310,7 +300,6 @@ 

        <packagereq>xorg-x11-utils</packagereq>

        <packagereq>xorg-x11-xauth</packagereq>

        <packagereq>xorg-x11-xinit</packagereq>

-       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>

      </packagelist>

    </group>

    <group>
@@ -422,8 +411,8 @@ 

        <packagereq type="mandatory">abrt-desktop</packagereq>

        <packagereq type="mandatory">abrt-java-connector</packagereq>

        <packagereq type="mandatory">alsa-plugins-pulseaudio</packagereq>

-       <packagereq type="mandatory">cinnamon</packagereq>

        <packagereq type="mandatory">blueberry</packagereq>

+       <packagereq type="mandatory">cinnamon</packagereq>

        <packagereq type="mandatory">cinnamon-control-center</packagereq>

        <packagereq type="mandatory">cinnamon-screensaver</packagereq>

        <packagereq type="mandatory">dnfdragora-updater</packagereq>
@@ -526,10 +515,10 @@ 

        <packagereq type="mandatory">rsync</packagereq>

        <packagereq arch="x86_64" type="mandatory">syslinux-extlinux</packagereq>

        <packagereq type="mandatory">tar</packagereq>

-       <packagereq type="default">fedora-release-cloud</packagereq>

        <packagereq type="default">console-login-helper-messages-issuegen</packagereq>

        <packagereq type="default">console-login-helper-messages-motdgen</packagereq>

        <packagereq type="default">console-login-helper-messages-profile</packagereq>

+       <packagereq type="default">fedora-release-cloud</packagereq>

      </packagelist>

    </group>

    <group>
@@ -623,9 +612,9 @@ 

        <packagereq type="optional">dracut-config-generic</packagereq>

        <packagereq type="optional">initial-setup</packagereq>

        <packagereq type="optional">initscripts</packagereq>

-       <packagereq type="optional" arch="armhfp">uboot-images-armv7</packagereq>

-       <packagereq type="optional" arch="aarch64">uboot-images-armv8</packagereq>

-       <packagereq type="optional" arch="armhfp,aarch64">uboot-tools</packagereq>

+       <packagereq arch="armhfp" type="optional">uboot-images-armv7</packagereq>

+       <packagereq arch="aarch64" type="optional">uboot-images-armv8</packagereq>

+       <packagereq arch="armhfp,aarch64" type="optional">uboot-tools</packagereq>

      </packagelist>

    </group>

    <!--
@@ -682,7 +671,7 @@ 

      <uservisible>false</uservisible>

      <packagelist>

        <packagereq type="mandatory">deepin-desktop</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>critical-path-gnome</id>
@@ -801,12 +790,12 @@ 

        <packagereq type="default">deepin-desktop</packagereq>

        <packagereq type="default">deepin-editor</packagereq>

        <packagereq type="default">deepin-file-manager</packagereq>

+       <packagereq type="default">deepin-icon-theme</packagereq>

        <packagereq type="default">deepin-image-viewer</packagereq>

        <packagereq type="default">deepin-picker</packagereq>

        <packagereq type="default">deepin-screenshot</packagereq>

        <packagereq type="default">deepin-system-monitor</packagereq>

        <packagereq type="default">dnfdragora-updater</packagereq>

-       <packagereq type="default">deepin-icon-theme</packagereq>

        <packagereq type="default">firewall-config</packagereq>

      </packagelist>

    </group>
@@ -850,6 +839,7 @@ 

      <default>false</default>

      <uservisible>true</uservisible>

      <packagelist>

+       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-data-extras</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dbp</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dds-plugin</packagereq>
@@ -868,7 +858,6 @@ 

        <packagereq type="conditional" requires="gimp">gimpfx-foundry</packagereq>

        <packagereq type="conditional" requires="gimp">gmic-gimp</packagereq>

        <packagereq type="conditional" requires="inkscape">inkscape-psd</packagereq>

-       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>

        <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>

        <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
@@ -1136,7 +1125,7 @@ 

        <packagereq type="default">eclipse-pydev</packagereq>

        <packagereq type="optional">eclipse-findbugs</packagereq>

        <packagereq type="optional">eclipse-m2e-core</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>editors</id>
@@ -1312,7 +1301,7 @@ 

        <packagereq type="default">yosys</packagereq>

        <packagereq type="optional">kdesvn</packagereq>

        <packagereq type="optional">minicom</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>engineering-and-scientific</id>
@@ -1493,7 +1482,7 @@ 

        <packagereq type="optional">auto-destdir</packagereq>

        <packagereq type="optional">cpanspec</packagereq>

        <packagereq type="optional">cvs</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>firefox</id>
@@ -1741,17 +1730,14 @@ 

        <packagereq type="optional">gnu-free-sans-fonts</packagereq>

        <packagereq type="optional">gnu-free-serif-fonts</packagereq>

        <packagereq type="optional">google-arimo-fonts</packagereq>

-       <packagereq type="optional">google-cousine-fonts</packagereq>

-       <packagereq type="optional">google-tinos-fonts</packagereq>

-       <packagereq type="optional">ht-caladea-fonts</packagereq>

        <packagereq type="optional">google-carlito-fonts</packagereq>

+       <packagereq type="optional">google-cousine-fonts</packagereq>

        <packagereq type="optional">google-droid-sans-fonts</packagereq>

        <packagereq type="optional">google-droid-sans-mono-fonts</packagereq>

        <packagereq type="optional">google-droid-serif-fonts</packagereq>

        <!-- <packagereq type="optional">google-noto-cjk-fonts</packagereq> -->

        <packagereq type="optional">google-noto-emoji-fonts</packagereq>

        <packagereq type="optional">google-noto-kufi-arabic-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-naskh-arabic-fonts</packagereq>

        <packagereq type="optional">google-noto-naskh-arabic-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-nastaliq-urdu-fonts</packagereq>
@@ -1759,8 +1745,8 @@ 

        <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-bamum-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-batak-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-bengali-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-buginese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-buhid-fonts</packagereq>
@@ -1776,11 +1762,10 @@ 

        <packagereq type="optional">google-noto-sans-cuneiform-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-cypriot-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-devanagari-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ethiopic-vf-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-georgian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-glagolitic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-gothic-fonts</packagereq>
@@ -1795,23 +1780,23 @@ 

        <packagereq type="optional">google-noto-sans-javanese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-jp-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kannada-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-khmer-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kr-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lao-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lepcha-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-limbu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-linear-b-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lisu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lydian-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-malayalam-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mandaic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-meetei-mayek-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mongolian-fonts</packagereq>
@@ -1819,8 +1804,9 @@ 

        <packagereq type="optional">google-noto-sans-mono-cjk-kr-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mono-cjk-sc-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mono-cjk-tc-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-myanmar-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-new-tai-lue-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-nko-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ogham-fonts</packagereq>
@@ -1851,18 +1837,19 @@ 

        <packagereq type="optional">google-noto-sans-tai-le-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tai-tham-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tai-viet-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tamil-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-telugu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-thaana-vf-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-thai-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tibetan-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tifinagh-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-yi-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-armenian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-bengali-fonts</packagereq>
@@ -1872,7 +1859,6 @@ 

        <packagereq type="optional">google-noto-serif-cjk-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-cjk-ttc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-devanagari-fonts</packagereq>

-       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-georgian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-gujarati-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-jp-fonts</packagereq>
@@ -1886,10 +1872,12 @@ 

        <packagereq type="optional">google-noto-serif-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-telugu-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-thai-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>

        <packagereq type="optional">google-roboto-condensed-fonts</packagereq>

        <packagereq type="optional">google-roboto-fonts</packagereq>

        <packagereq type="optional">google-roboto-mono-fonts</packagereq>

        <packagereq type="optional">google-roboto-slab-fonts</packagereq>

+       <packagereq type="optional">google-tinos-fonts</packagereq>

        <packagereq type="optional">grimmer-proggy-squaresz-fonts</packagereq>

        <packagereq type="optional">grimmer-proggy-tinysz-fonts</packagereq>

        <packagereq type="optional">gubbi-fonts</packagereq>
@@ -1903,6 +1891,7 @@ 

        <packagereq type="optional">horai-ume-pmincho-fonts</packagereq>

        <packagereq type="optional">horai-ume-uigothic-fonts</packagereq>

        <packagereq type="optional">ht-alegreya-fonts</packagereq>

+       <packagereq type="optional">ht-caladea-fonts</packagereq>

        <packagereq type="optional">impallari-raleway-fonts</packagereq>

        <packagereq type="optional">ipa-ex-gothic-fonts</packagereq>

        <packagereq type="optional">ipa-ex-mincho-fonts</packagereq>
@@ -2780,6 +2769,7 @@ 

      <default>false</default>

      <uservisible>false</uservisible>

      <packagelist>

+       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>

        <packagereq type="default">atmel-firmware</packagereq>

        <packagereq type="default">b43-fwcutter</packagereq>

        <packagereq type="default">b43-openfwwf</packagereq>
@@ -2806,7 +2796,6 @@ 

        <packagereq type="default">libertas-usb8388-firmware</packagereq>

        <packagereq type="default">usb_modeswitch</packagereq>

        <packagereq type="default">zd1211-firmware</packagereq>

-       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>

        <packagereq type="optional">acpi</packagereq>

        <packagereq type="optional">acpitool</packagereq>

        <packagereq type="optional">alsa-firmware</packagereq>
@@ -2929,7 +2918,7 @@ 

        <packagereq type="optional">uim-m17n</packagereq>

        <packagereq type="optional">uim-qt</packagereq>

        <packagereq type="optional">uim-skk</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>java</id>
@@ -3022,7 +3011,7 @@ 

        <packagereq>java-1.8.0-openjdk-devel</packagereq>

        <packagereq>jboss-modules</packagereq>

        <packagereq>maven</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>kde-apps</id>
@@ -3509,7 +3498,7 @@ 

        <packagereq>brasero</packagereq>

        <packagereq>lxmusic</packagereq>

        <packagereq>pavucontrol</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>lxde-office</id>
@@ -3609,7 +3598,7 @@ 

      <uservisible>false</uservisible>

      <packagelist>

        <packagereq>pavucontrol</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>lxqt-office</id>
@@ -3893,7 +3882,7 @@ 

      <packagelist>

        <packagereq>mongo-cxx-driver</packagereq>

        <packagereq>mongo-cxx-driver-devel</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>multimedia</id>
@@ -4240,8 +4229,8 @@ 

      <packagelist>

        <packagereq>calls</packagereq>

        <packagereq>feedbackd</packagereq>

-       <packagereq>gnome-terminal</packagereq>

        <packagereq>gnome-contacts</packagereq>

+       <packagereq>gnome-terminal</packagereq>

        <packagereq>NetworkManager</packagereq>

        <packagereq>phoc</packagereq>

        <packagereq>phosh</packagereq>
@@ -4400,7 +4389,6 @@ 

      <uservisible>true</uservisible>

      <packagelist>

        <packagereq type="default">arduino</packagereq>

-       <packagereq type="default">git</packagereq>

        <packagereq type="default">fawkes</packagereq>

        <packagereq type="default">fawkes-core</packagereq>

        <packagereq type="default">fawkes-doc</packagereq>
@@ -4425,6 +4413,7 @@ 

        <packagereq type="default">gazebo</packagereq>

        <packagereq type="default">gazebo-doc</packagereq>

        <packagereq type="default">gearbox</packagereq>

+       <packagereq type="default">git</packagereq>

        <packagereq type="default">libphidget</packagereq>

        <packagereq type="default">mrpt-apps</packagereq>

        <packagereq type="default">mrpt-doc</packagereq>
@@ -4436,11 +4425,11 @@ 

        <packagereq type="default">player-doc</packagereq>

        <packagereq type="default">player-examples</packagereq>

        <packagereq type="default">player-stage</packagereq>

-       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-bloom</packagereq>

        <packagereq type="default">python3-catkin_lint</packagereq>

        <packagereq type="default">python3-catkin_pkg</packagereq>

        <packagereq type="default">python3-catkin_tools</packagereq>

+       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-rosdep</packagereq>

        <packagereq type="default">python3-rosdistro</packagereq>

        <packagereq type="default">python3-rosinstall</packagereq>
@@ -5006,10 +4995,10 @@ 

        <packagereq>alsa-plugins-pulseaudio</packagereq>

        <packagereq>alsa-utils</packagereq>

        <packagereq>gnome-power-manager</packagereq>

+       <packagereq>gstreamer-plugins-espeak</packagereq>

+       <packagereq>gstreamer1-plugins-bad-free</packagereq>

        <packagereq>gstreamer1-plugins-base</packagereq>

        <packagereq>gstreamer1-plugins-good</packagereq>

-       <packagereq>gstreamer1-plugins-bad-free</packagereq>

-       <packagereq>gstreamer-plugins-espeak</packagereq>

        <packagereq>gvfs</packagereq>

        <packagereq>lightdm</packagereq>

        <packagereq>lightdm-gtk</packagereq>
@@ -5017,20 +5006,20 @@ 

        <packagereq>pulseaudio</packagereq>

        <packagereq>pulseaudio-utils</packagereq>

        <packagereq>sugar</packagereq>

-       <packagereq>sugar-logos</packagereq>

-       <packagereq>sugar-cp-updater</packagereq>

        <packagereq>sugar-abacus</packagereq>

        <packagereq>sugar-browse</packagereq>

        <packagereq>sugar-calculator</packagereq>

        <packagereq>sugar-chat</packagereq>

        <packagereq>sugar-clock</packagereq>

        <packagereq>sugar-cp-all</packagereq>

+       <packagereq>sugar-cp-updater</packagereq>

        <packagereq>sugar-finance</packagereq>

        <packagereq>sugar-fototoon</packagereq>

        <packagereq>sugar-imageviewer</packagereq>

        <packagereq>sugar-implode</packagereq>

        <packagereq>sugar-jukebox</packagereq>

        <packagereq>sugar-log</packagereq>

+       <packagereq>sugar-logos</packagereq>

        <packagereq>sugar-maze</packagereq>

        <packagereq>sugar-memorize</packagereq>

        <packagereq>sugar-moon</packagereq>
@@ -5597,6 +5586,17 @@ 

      </packagelist>

    </group>

    <group>

+     <id>x86-baremetal-tools</id>

+     <_name>x86 Baremetal Tools</_name>

+     <_description>Tools for working with baremetal x86 systems</_description>

+     <default>false</default>

+     <uservisible>false</uservisible>

+     <packagelist>

+       <packagereq>memtest86+</packagereq>

+       <packagereq>syslinux</packagereq>

+     </packagelist>

+   </group>

+   <group>

      <id>xfce-apps</id>

      <_name>Applications for the Xfce Desktop</_name>

      <_description>A set of commonly used applications for the Xfce Desktop</_description>
@@ -5651,8 +5651,8 @@ 

        <packagereq>dnfdragora-updater</packagereq>

        <packagereq>firewall-config</packagereq>

        <packagereq>gnome-keyring-pam</packagereq>

-       <packagereq>greybird-light-theme</packagereq>

        <packagereq>greybird-dark-theme</packagereq>

+       <packagereq>greybird-light-theme</packagereq>

        <packagereq>greybird-xfce4-notifyd-theme</packagereq>

        <packagereq>greybird-xfwm4-theme</packagereq>

        <packagereq>gtk-xfce-engine</packagereq>
@@ -5770,7 +5770,7 @@ 

        <packagereq type="default">xfce4-dev-tools</packagereq>

        <packagereq type="default">xfce4-panel-devel</packagereq>

        <packagereq type="default">xfconf-devel</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>xmonad</id>
@@ -6285,6 +6285,15 @@ 

      </grouplist>

    </category>

    <category>

+     <id>neuroscience</id>

+     <_name>Neuroscience</_name>

+     <_description>Tools for Neuroscience.</_description>

+     <display_order>120</display_order>

+     <grouplist>

+       <groupid>neuron-modelling-simulators</groupid>

+     </grouplist>

+   </category>

+   <category>

      <id>xfce-desktop-environment</id>

      <_name>Xfce Desktop</_name>

      <_description>A lightweight desktop environment that works well on low end machines.</_description>
@@ -6492,15 +6501,6 @@ 

        <groupid>virtualization</groupid>

      </grouplist>

    </category>

-   <category>

-     <id>neuroscience</id>

-     <_name>Neuroscience</_name>

-     <_description>Tools for Neuroscience.</_description>

-     <display_order>120</display_order>

-     <grouplist>

-       <groupid>neuron-modelling-simulators</groupid>

-     </grouplist>

-   </category>

    <langpacks>

      <match install="LabPlot-doc-%s" name="LabPlot-doc"/>

      <match install="aspell-%s" name="aspell"/>

file modified
+102 -64
@@ -1,4 +1,4 @@ 

- <?xml version='1.0' encoding='UTF-8'?>

+ <?xml version="1.0" encoding="UTF-8"?>

  <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">

  <comps>

    <group>
@@ -114,17 +114,6 @@ 

      </packagelist>

    </group>

    <group>

-     <id>x86-baremetal-tools</id>

-     <_name>x86 Baremetal Tools</_name>

-     <_description>Tools for working with baremetal x86 systems</_description>

-     <default>false</default>

-     <uservisible>false</uservisible>

-     <packagelist>

-       <packagereq>memtest86+</packagereq>

-       <packagereq>syslinux</packagereq>

-     </packagelist>

-   </group>

-   <group>

      <id>audio</id>

      <_name>Audio Production</_name>

      <_description>Various tools for audio synthesis and music production.</_description>
@@ -208,8 +197,8 @@ 

        <packagereq type="default">mup</packagereq>

        <packagereq type="default">muse</packagereq>

        <packagereq type="default">new-session-manager</packagereq>

-       <packagereq type="default">pulseaudio-module-jack</packagereq>

        <packagereq type="default">pavucontrol</packagereq>

+       <packagereq type="default">pulseaudio-module-jack</packagereq>

        <packagereq type="default">qastools</packagereq>

        <packagereq type="default">qjackctl</packagereq>

        <packagereq type="default">qmidiarp</packagereq>
@@ -294,6 +283,7 @@ 

        <packagereq>mesa-vulkan-drivers</packagereq>

        <packagereq>plymouth-system-theme</packagereq>

        <packagereq>xorg-x11-drv-amdgpu</packagereq>

+       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>

        <packagereq>xorg-x11-drv-armsoc</packagereq>

        <packagereq>xorg-x11-drv-ati</packagereq>

        <packagereq>xorg-x11-drv-evdev</packagereq>
@@ -310,7 +300,6 @@ 

        <packagereq>xorg-x11-utils</packagereq>

        <packagereq>xorg-x11-xauth</packagereq>

        <packagereq>xorg-x11-xinit</packagereq>

-       <packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>

      </packagelist>

    </group>

    <group>
@@ -422,8 +411,8 @@ 

        <packagereq type="mandatory">abrt-desktop</packagereq>

        <packagereq type="mandatory">abrt-java-connector</packagereq>

        <packagereq type="mandatory">alsa-plugins-pulseaudio</packagereq>

-       <packagereq type="mandatory">cinnamon</packagereq>

        <packagereq type="mandatory">blueberry</packagereq>

+       <packagereq type="mandatory">cinnamon</packagereq>

        <packagereq type="mandatory">cinnamon-control-center</packagereq>

        <packagereq type="mandatory">cinnamon-screensaver</packagereq>

        <packagereq type="mandatory">dnfdragora-updater</packagereq>
@@ -526,10 +515,10 @@ 

        <packagereq type="mandatory">rsync</packagereq>

        <packagereq arch="x86_64" type="mandatory">syslinux-extlinux</packagereq>

        <packagereq type="mandatory">tar</packagereq>

-       <packagereq type="default">fedora-release-cloud</packagereq>

        <packagereq type="default">console-login-helper-messages-issuegen</packagereq>

        <packagereq type="default">console-login-helper-messages-motdgen</packagereq>

        <packagereq type="default">console-login-helper-messages-profile</packagereq>

+       <packagereq type="default">fedora-release-cloud</packagereq>

      </packagelist>

    </group>

    <group>
@@ -623,9 +612,9 @@ 

        <packagereq type="optional">dracut-config-generic</packagereq>

        <packagereq type="optional">initial-setup</packagereq>

        <packagereq type="optional">initscripts</packagereq>

-       <packagereq type="optional" arch="armhfp">uboot-images-armv7</packagereq>

-       <packagereq type="optional" arch="aarch64">uboot-images-armv8</packagereq>

-       <packagereq type="optional" arch="armhfp,aarch64">uboot-tools</packagereq>

+       <packagereq arch="armhfp" type="optional">uboot-images-armv7</packagereq>

+       <packagereq arch="aarch64" type="optional">uboot-images-armv8</packagereq>

+       <packagereq arch="armhfp,aarch64" type="optional">uboot-tools</packagereq>

      </packagelist>

    </group>

    <!--
@@ -682,7 +671,7 @@ 

      <uservisible>false</uservisible>

      <packagelist>

        <packagereq type="mandatory">deepin-desktop</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>critical-path-gnome</id>
@@ -801,12 +790,12 @@ 

        <packagereq type="default">deepin-desktop</packagereq>

        <packagereq type="default">deepin-editor</packagereq>

        <packagereq type="default">deepin-file-manager</packagereq>

+       <packagereq type="default">deepin-icon-theme</packagereq>

        <packagereq type="default">deepin-image-viewer</packagereq>

        <packagereq type="default">deepin-picker</packagereq>

        <packagereq type="default">deepin-screenshot</packagereq>

        <packagereq type="default">deepin-system-monitor</packagereq>

        <packagereq type="default">dnfdragora-updater</packagereq>

-       <packagereq type="default">deepin-icon-theme</packagereq>

        <packagereq type="default">firewall-config</packagereq>

      </packagelist>

    </group>
@@ -850,6 +839,7 @@ 

      <default>false</default>

      <uservisible>true</uservisible>

      <packagelist>

+       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-data-extras</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dbp</packagereq>

        <packagereq type="conditional" requires="gimp">gimp-dds-plugin</packagereq>
@@ -868,7 +858,6 @@ 

        <packagereq type="conditional" requires="gimp">gimpfx-foundry</packagereq>

        <packagereq type="conditional" requires="gimp">gmic-gimp</packagereq>

        <packagereq type="conditional" requires="inkscape">inkscape-psd</packagereq>

-       <packagereq type="conditional" requires="blender">blender-luxcorerender</packagereq>

        <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>

        <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>

        <packagereq type="conditional" requires="blender">YafaRay-blender</packagereq>
@@ -1136,7 +1125,7 @@ 

        <packagereq type="default">eclipse-pydev</packagereq>

        <packagereq type="optional">eclipse-findbugs</packagereq>

        <packagereq type="optional">eclipse-m2e-core</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>editors</id>
@@ -1312,7 +1301,24 @@ 

        <packagereq type="default">yosys</packagereq>

        <packagereq type="optional">kdesvn</packagereq>

        <packagereq type="optional">minicom</packagereq>

-       </packagelist>

+     </packagelist>

+   </group>

+   <group>

+     <id>eln-product</id>

+     <!-- Translators: Don't translate this product name -->

+     <_name>Fedora ELN product core</_name>

+     <_description>Packages mandatory for Fedora ELN</_description>

+     <default>false</default>

+     <uservisible>false</uservisible>

+     <packagelist>

+       <packagereq type="mandatory">chrony</packagereq>

+       <packagereq type="mandatory">PackageKit</packagereq>

+       <packagereq type="mandatory">polkit</packagereq>

+       <packagereq type="mandatory">realmd</packagereq>

+       <packagereq type="default">dhcp-client</packagereq>

+       <packagereq type="default">fedora-release-eln</packagereq>

+       <packagereq type="default">NetworkManager-team</packagereq>

+     </packagelist>

    </group>

    <group>

      <id>engineering-and-scientific</id>
@@ -1493,7 +1499,7 @@ 

        <packagereq type="optional">auto-destdir</packagereq>

        <packagereq type="optional">cpanspec</packagereq>

        <packagereq type="optional">cvs</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>firefox</id>
@@ -1741,17 +1747,14 @@ 

        <packagereq type="optional">gnu-free-sans-fonts</packagereq>

        <packagereq type="optional">gnu-free-serif-fonts</packagereq>

        <packagereq type="optional">google-arimo-fonts</packagereq>

-       <packagereq type="optional">google-cousine-fonts</packagereq>

-       <packagereq type="optional">google-tinos-fonts</packagereq>

-       <packagereq type="optional">ht-caladea-fonts</packagereq>

        <packagereq type="optional">google-carlito-fonts</packagereq>

+       <packagereq type="optional">google-cousine-fonts</packagereq>

        <packagereq type="optional">google-droid-sans-fonts</packagereq>

        <packagereq type="optional">google-droid-sans-mono-fonts</packagereq>

        <packagereq type="optional">google-droid-serif-fonts</packagereq>

        <!-- <packagereq type="optional">google-noto-cjk-fonts</packagereq> -->

        <packagereq type="optional">google-noto-emoji-fonts</packagereq>

        <packagereq type="optional">google-noto-kufi-arabic-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-naskh-arabic-fonts</packagereq>

        <packagereq type="optional">google-noto-naskh-arabic-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-nastaliq-urdu-fonts</packagereq>
@@ -1759,8 +1762,8 @@ 

        <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-bamum-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-batak-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-bengali-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-bengali-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-buginese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-buhid-fonts</packagereq>
@@ -1776,11 +1779,10 @@ 

        <packagereq type="optional">google-noto-sans-cuneiform-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-cypriot-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-devanagari-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-devanagari-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ethiopic-vf-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-georgian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-glagolitic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-gothic-fonts</packagereq>
@@ -1795,23 +1797,23 @@ 

        <packagereq type="optional">google-noto-sans-javanese-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-jp-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kannada-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-kannada-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-khmer-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-khmer-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-kr-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lao-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-lao-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lepcha-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-limbu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-linear-b-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lisu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-lydian-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-malayalam-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-malayalam-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mandaic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-meetei-mayek-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mongolian-fonts</packagereq>
@@ -1819,8 +1821,9 @@ 

        <packagereq type="optional">google-noto-sans-mono-cjk-kr-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mono-cjk-sc-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-mono-cjk-tc-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-mono-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-myanmar-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-myanmar-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-new-tai-lue-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-nko-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ogham-fonts</packagereq>
@@ -1851,18 +1854,19 @@ 

        <packagereq type="optional">google-noto-sans-tai-le-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tai-tham-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tai-viet-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tamil-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-tamil-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-telugu-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-thaana-vf-fonts</packagereq>

-       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-thai-ui-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-thai-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tibetan-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-tifinagh-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>

+       <packagereq type="optional">google-noto-sans-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-sans-yi-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-armenian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-bengali-fonts</packagereq>
@@ -1872,7 +1876,6 @@ 

        <packagereq type="optional">google-noto-serif-cjk-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-cjk-ttc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-devanagari-fonts</packagereq>

-       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-georgian-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-gujarati-vf-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-jp-fonts</packagereq>
@@ -1886,10 +1889,12 @@ 

        <packagereq type="optional">google-noto-serif-tc-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-telugu-fonts</packagereq>

        <packagereq type="optional">google-noto-serif-thai-vf-fonts</packagereq>

+       <packagereq type="optional">google-noto-serif-vf-fonts</packagereq>

        <packagereq type="optional">google-roboto-condensed-fonts</packagereq>

        <packagereq type="optional">google-roboto-fonts</packagereq>

        <packagereq type="optional">google-roboto-mono-fonts</packagereq>

        <packagereq type="optional">google-roboto-slab-fonts</packagereq>

+       <packagereq type="optional">google-tinos-fonts</packagereq>

        <packagereq type="optional">grimmer-proggy-squaresz-fonts</packagereq>

        <packagereq type="optional">grimmer-proggy-tinysz-fonts</packagereq>

        <packagereq type="optional">gubbi-fonts</packagereq>
@@ -1903,6 +1908,7 @@ 

        <packagereq type="optional">horai-ume-pmincho-fonts</packagereq>

        <packagereq type="optional">horai-ume-uigothic-fonts</packagereq>

        <packagereq type="optional">ht-alegreya-fonts</packagereq>

+       <packagereq type="optional">ht-caladea-fonts</packagereq>

        <packagereq type="optional">impallari-raleway-fonts</packagereq>

        <packagereq type="optional">ipa-ex-gothic-fonts</packagereq>

        <packagereq type="optional">ipa-ex-mincho-fonts</packagereq>
@@ -2783,6 +2789,7 @@ 

      <default>false</default>

      <uservisible>false</uservisible>

      <packagelist>

+       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>

        <packagereq type="default">atmel-firmware</packagereq>

        <packagereq type="default">b43-fwcutter</packagereq>

        <packagereq type="default">b43-openfwwf</packagereq>
@@ -2809,7 +2816,6 @@ 

        <packagereq type="default">libertas-usb8388-firmware</packagereq>

        <packagereq type="default">usb_modeswitch</packagereq>

        <packagereq type="default">zd1211-firmware</packagereq>

-       <packagereq arch="x86_64" type="default">alsa-sof-firmware</packagereq>

        <packagereq type="optional">acpi</packagereq>

        <packagereq type="optional">acpitool</packagereq>

        <packagereq type="optional">alsa-firmware</packagereq>
@@ -2932,7 +2938,7 @@ 

        <packagereq type="optional">uim-m17n</packagereq>

        <packagereq type="optional">uim-qt</packagereq>

        <packagereq type="optional">uim-skk</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>java</id>
@@ -3025,7 +3031,7 @@ 

        <packagereq>java-1.8.0-openjdk-devel</packagereq>

        <packagereq>jboss-modules</packagereq>

        <packagereq>maven</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>kde-apps</id>
@@ -3513,7 +3519,7 @@ 

        <packagereq>brasero</packagereq>

        <packagereq>lxmusic</packagereq>

        <packagereq>pavucontrol</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>lxde-office</id>
@@ -3613,7 +3619,7 @@ 

      <uservisible>false</uservisible>

      <packagelist>

        <packagereq>pavucontrol</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>lxqt-office</id>
@@ -3897,7 +3903,7 @@ 

      <packagelist>

        <packagereq>mongo-cxx-driver</packagereq>

        <packagereq>mongo-cxx-driver-devel</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>multimedia</id>
@@ -4244,8 +4250,8 @@ 

      <packagelist>

        <packagereq>calls</packagereq>

        <packagereq>feedbackd</packagereq>

-       <packagereq>gnome-terminal</packagereq>

        <packagereq>gnome-contacts</packagereq>

+       <packagereq>gnome-terminal</packagereq>

        <packagereq>NetworkManager</packagereq>

        <packagereq>phoc</packagereq>

        <packagereq>phosh</packagereq>
@@ -4404,7 +4410,6 @@ 

      <uservisible>true</uservisible>

      <packagelist>

        <packagereq type="default">arduino</packagereq>

-       <packagereq type="default">git</packagereq>

        <packagereq type="default">fawkes</packagereq>

        <packagereq type="default">fawkes-core</packagereq>

        <packagereq type="default">fawkes-doc</packagereq>
@@ -4429,6 +4434,7 @@ 

        <packagereq type="default">gazebo</packagereq>

        <packagereq type="default">gazebo-doc</packagereq>

        <packagereq type="default">gearbox</packagereq>

+       <packagereq type="default">git</packagereq>

        <packagereq type="default">libphidget</packagereq>

        <packagereq type="default">mrpt-apps</packagereq>

        <packagereq type="default">mrpt-doc</packagereq>
@@ -4440,11 +4446,11 @@ 

        <packagereq type="default">player-doc</packagereq>

        <packagereq type="default">player-examples</packagereq>

        <packagereq type="default">player-stage</packagereq>

-       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-bloom</packagereq>

        <packagereq type="default">python3-catkin_lint</packagereq>

        <packagereq type="default">python3-catkin_pkg</packagereq>

        <packagereq type="default">python3-catkin_tools</packagereq>

+       <packagereq type="default">python3-player</packagereq>

        <packagereq type="default">python3-rosdep</packagereq>

        <packagereq type="default">python3-rosdistro</packagereq>

        <packagereq type="default">python3-rosinstall</packagereq>
@@ -5009,10 +5015,10 @@ 

        <packagereq>alsa-plugins-pulseaudio</packagereq>

        <packagereq>alsa-utils</packagereq>

        <packagereq>gnome-power-manager</packagereq>

+       <packagereq>gstreamer-plugins-espeak</packagereq>

+       <packagereq>gstreamer1-plugins-bad-free</packagereq>

        <packagereq>gstreamer1-plugins-base</packagereq>

        <packagereq>gstreamer1-plugins-good</packagereq>

-       <packagereq>gstreamer1-plugins-bad-free</packagereq>

-       <packagereq>gstreamer-plugins-espeak</packagereq>

        <packagereq>gvfs</packagereq>

        <packagereq>lightdm</packagereq>

        <packagereq>lightdm-gtk</packagereq>
@@ -5020,20 +5026,20 @@ 

        <packagereq>pulseaudio</packagereq>

        <packagereq>pulseaudio-utils</packagereq>

        <packagereq>sugar</packagereq>

-       <packagereq>sugar-logos</packagereq>

-       <packagereq>sugar-cp-updater</packagereq>

        <packagereq>sugar-abacus</packagereq>

        <packagereq>sugar-browse</packagereq>

        <packagereq>sugar-calculator</packagereq>

        <packagereq>sugar-chat</packagereq>

        <packagereq>sugar-clock</packagereq>

        <packagereq>sugar-cp-all</packagereq>

+       <packagereq>sugar-cp-updater</packagereq>

        <packagereq>sugar-finance</packagereq>

        <packagereq>sugar-fototoon</packagereq>

        <packagereq>sugar-imageviewer</packagereq>

        <packagereq>sugar-implode</packagereq>

        <packagereq>sugar-jukebox</packagereq>

        <packagereq>sugar-log</packagereq>

+       <packagereq>sugar-logos</packagereq>

        <packagereq>sugar-maze</packagereq>

        <packagereq>sugar-memorize</packagereq>

        <packagereq>sugar-moon</packagereq>
@@ -5596,6 +5602,17 @@ 

      </packagelist>

    </group>

    <group>

+     <id>x86-baremetal-tools</id>

+     <_name>x86 Baremetal Tools</_name>

+     <_description>Tools for working with baremetal x86 systems</_description>

+     <default>false</default>

+     <uservisible>false</uservisible>

+     <packagelist>

+       <packagereq>memtest86+</packagereq>

+       <packagereq>syslinux</packagereq>

+     </packagelist>

+   </group>

+   <group>

      <id>xfce-apps</id>

      <_name>Applications for the Xfce Desktop</_name>

      <_description>A set of commonly used applications for the Xfce Desktop</_description>
@@ -5650,8 +5667,8 @@ 

        <packagereq>dnfdragora-updater</packagereq>

        <packagereq>firewall-config</packagereq>

        <packagereq>gnome-keyring-pam</packagereq>

-       <packagereq>greybird-light-theme</packagereq>

        <packagereq>greybird-dark-theme</packagereq>

+       <packagereq>greybird-light-theme</packagereq>

        <packagereq>greybird-xfce4-notifyd-theme</packagereq>

        <packagereq>greybird-xfwm4-theme</packagereq>

        <packagereq>gtk-xfce-engine</packagereq>
@@ -5769,7 +5786,7 @@ 

        <packagereq type="default">xfce4-dev-tools</packagereq>

        <packagereq type="default">xfce4-panel-devel</packagereq>

        <packagereq type="default">xfconf-devel</packagereq>

-       </packagelist>

+     </packagelist>

    </group>

    <group>

      <id>xmonad</id>
@@ -6126,6 +6143,27 @@ 

      </optionlist>

    </environment>

    <environment>

+     <id>eln-environment</id>

+     <!-- Translators: Don't translate this product name -->

+     <_name>Fedora ELN</_name>

+     <_description>A development preview for a future Red Hat Enterprise Linux release</_description>

+     <display_order>3</display_order>

+     <grouplist>

+       <groupid>eln-product</groupid>

+       <groupid>standard</groupid>

+       <groupid>core</groupid>

+       <groupid>headless-management</groupid>

+       <groupid>hardware-support</groupid>

+       <groupid>networkmanager-submodules</groupid>

+     </grouplist>

+     <optionlist>

+       <groupid>container-management</groupid>

+       <groupid>domain-client</groupid>

+       <groupid>guest-agents</groupid>

+       <groupid>server-hardware-support</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>
@@ -6284,6 +6322,15 @@ 

      </grouplist>

    </category>

    <category>

+     <id>neuroscience</id>

+     <_name>Neuroscience</_name>

+     <_description>Tools for Neuroscience.</_description>

+     <display_order>120</display_order>

+     <grouplist>

+       <groupid>neuron-modelling-simulators</groupid>

+     </grouplist>

+   </category>

+   <category>

      <id>xfce-desktop-environment</id>

      <_name>Xfce Desktop</_name>

      <_description>A lightweight desktop environment that works well on low end machines.</_description>
@@ -6491,15 +6538,6 @@ 

        <groupid>virtualization</groupid>

      </grouplist>

    </category>

-   <category>

-     <id>neuroscience</id>

-     <_name>Neuroscience</_name>

-     <_description>Tools for Neuroscience.</_description>

-     <display_order>120</display_order>

-     <grouplist>

-       <groupid>neuron-modelling-simulators</groupid>

-     </grouplist>

-   </category>

    <langpacks>

      <match install="LabPlot-doc-%s" name="LabPlot-doc"/>

      <match install="aspell-%s" name="aspell"/>

Also includes a second patch with the results of make all to re-sort and clean up the XML. Patch 2 contains no changes.

Pull-Request has been closed by sgallagh

3 years ago