From 89abba0b0f243fe6e122a27ff76adfcda1f5ae7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Mon, 11 Oct 2021 19:36:15 +0200
Subject: [PATCH] Run 'make sort' on Fedora comps

---
 comps-f34.xml.in |  6 +++---
 comps-f35.xml.in | 26 +++++++++++++-------------
 comps-f36.xml.in | 26 +++++++++++++-------------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/comps-f34.xml.in b/comps-f34.xml.in
index 9bc4439d..2ee3f482 100644
--- a/comps-f34.xml.in
+++ b/comps-f34.xml.in
@@ -1506,8 +1506,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>fedora-bookmarks</packagereq>
-      <packagereq type="default">libglvnd-gles</packagereq>
       <packagereq type="mandatory">firefox</packagereq>
+      <packagereq type="default">libglvnd-gles</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3159,8 +3159,8 @@
       <packagereq>kwrite</packagereq>
       <packagereq>NetworkManager-config-connectivity-fedora</packagereq>
       <packagereq>okular</packagereq>
-      <packagereq>pam-kwallet</packagereq>
       <packagereq>PackageKit-command-not-found</packagereq>
+      <packagereq>pam-kwallet</packagereq>
       <packagereq>phonon-qt5-backend-gstreamer</packagereq>
       <packagereq>pinentry-qt</packagereq>
       <packagereq>plasma-breeze</packagereq>
@@ -3857,9 +3857,9 @@
       <packagereq>usermode-gtk</packagereq>
       <packagereq>vim-enhanced</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
+      <packagereq>xfburn</packagereq>
       <packagereq>xmodmap</packagereq>
       <packagereq>xrdb</packagereq>
-      <packagereq>xfburn</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq type="default">fedora-release-matecompiz</packagereq>
     </packagelist>
diff --git a/comps-f35.xml.in b/comps-f35.xml.in
index 1e1486e2..561a60f5 100644
--- a/comps-f35.xml.in
+++ b/comps-f35.xml.in
@@ -219,8 +219,8 @@
       <packagereq type="default">timidity++</packagereq>
       <packagereq type="default">tuxguitar</packagereq>
       <packagereq type="default">vmpk</packagereq>
-      <packagereq type="default">wireplumber</packagereq>
       <packagereq type="default">whysynth-dssi</packagereq>
+      <packagereq type="default">wireplumber</packagereq>
       <packagereq type="default">xsynth-dssi</packagereq>
       <packagereq type="default">yoshimi</packagereq>
       <packagereq type="default">zita-at1</packagereq>
@@ -466,12 +466,12 @@
       <packagereq type="mandatory">tmux-powerline</packagereq>
       <packagereq type="mandatory">transmission</packagereq>
       <packagereq type="mandatory">vim-powerline</packagereq>
-      <packagereq type="default">wireplumber</packagereq>
       <packagereq type="mandatory">xawtv</packagereq>
       <packagereq type="mandatory">xdg-user-dirs-gtk</packagereq>
       <packagereq type="mandatory">xed</packagereq>
       <packagereq type="mandatory">xfburn</packagereq>
       <packagereq type="mandatory">xreader</packagereq>
+      <packagereq type="default">wireplumber</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1519,8 +1519,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>fedora-bookmarks</packagereq>
-      <packagereq type="default">libglvnd-gles</packagereq>
       <packagereq type="mandatory">firefox</packagereq>
+      <packagereq type="default">libglvnd-gles</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2890,6 +2890,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="mandatory">brightnessctl</packagereq>
       <packagereq type="mandatory">dunst</packagereq>
       <packagereq type="mandatory">i3</packagereq>
       <packagereq type="mandatory">i3lock</packagereq>
@@ -2900,10 +2901,9 @@
       <packagereq type="mandatory">mousepad</packagereq>
       <packagereq type="mandatory">network-manager-applet</packagereq>
       <packagereq type="mandatory">NetworkManager</packagereq>
-      <packagereq type="mandatory">pulseaudio-utils</packagereq>
       <packagereq type="mandatory">pavucontrol</packagereq>
+      <packagereq type="mandatory">pulseaudio-utils</packagereq>
       <packagereq type="mandatory">volumeicon</packagereq>
-      <packagereq type="mandatory">brightnessctl</packagereq>
       <packagereq type="default">azote</packagereq>
       <packagereq type="default">dmenu</packagereq>
       <packagereq type="default">firefox</packagereq>
@@ -3114,6 +3114,13 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="mandatory">plasma-desktop</packagereq>
+      <packagereq type="mandatory">plasma-workspace</packagereq>
+      <packagereq type="mandatory">qt5-qtbase-gui</packagereq>
+      <packagereq type="mandatory">sddm</packagereq>
+      <packagereq type="mandatory">sddm-breeze</packagereq>
+      <packagereq type="mandatory">sddm-kcm</packagereq>
+      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">adwaita-gtk2-theme</packagereq>
       <packagereq type="default">akregator</packagereq>
@@ -3196,13 +3203,6 @@
       <packagereq type="default">qt5-qtdeclarative</packagereq>
       <packagereq type="default">spectacle</packagereq>
       <packagereq type="default">xorg-x11-drv-libinput</packagereq>
-      <packagereq type="mandatory">plasma-desktop</packagereq>
-      <packagereq type="mandatory">plasma-workspace</packagereq>
-      <packagereq type="mandatory">qt5-qtbase-gui</packagereq>
-      <packagereq type="mandatory">sddm</packagereq>
-      <packagereq type="mandatory">sddm-breeze</packagereq>
-      <packagereq type="mandatory">sddm-kcm</packagereq>
-      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3869,9 +3869,9 @@
       <packagereq>vim-enhanced</packagereq>
       <packagereq>wireplumber</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
+      <packagereq>xfburn</packagereq>
       <packagereq>xmodmap</packagereq>
       <packagereq>xrdb</packagereq>
-      <packagereq>xfburn</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq type="default">fedora-release-matecompiz</packagereq>
     </packagelist>
diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index 1e1486e2..561a60f5 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -219,8 +219,8 @@
       <packagereq type="default">timidity++</packagereq>
       <packagereq type="default">tuxguitar</packagereq>
       <packagereq type="default">vmpk</packagereq>
-      <packagereq type="default">wireplumber</packagereq>
       <packagereq type="default">whysynth-dssi</packagereq>
+      <packagereq type="default">wireplumber</packagereq>
       <packagereq type="default">xsynth-dssi</packagereq>
       <packagereq type="default">yoshimi</packagereq>
       <packagereq type="default">zita-at1</packagereq>
@@ -466,12 +466,12 @@
       <packagereq type="mandatory">tmux-powerline</packagereq>
       <packagereq type="mandatory">transmission</packagereq>
       <packagereq type="mandatory">vim-powerline</packagereq>
-      <packagereq type="default">wireplumber</packagereq>
       <packagereq type="mandatory">xawtv</packagereq>
       <packagereq type="mandatory">xdg-user-dirs-gtk</packagereq>
       <packagereq type="mandatory">xed</packagereq>
       <packagereq type="mandatory">xfburn</packagereq>
       <packagereq type="mandatory">xreader</packagereq>
+      <packagereq type="default">wireplumber</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1519,8 +1519,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>fedora-bookmarks</packagereq>
-      <packagereq type="default">libglvnd-gles</packagereq>
       <packagereq type="mandatory">firefox</packagereq>
+      <packagereq type="default">libglvnd-gles</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2890,6 +2890,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="mandatory">brightnessctl</packagereq>
       <packagereq type="mandatory">dunst</packagereq>
       <packagereq type="mandatory">i3</packagereq>
       <packagereq type="mandatory">i3lock</packagereq>
@@ -2900,10 +2901,9 @@
       <packagereq type="mandatory">mousepad</packagereq>
       <packagereq type="mandatory">network-manager-applet</packagereq>
       <packagereq type="mandatory">NetworkManager</packagereq>
-      <packagereq type="mandatory">pulseaudio-utils</packagereq>
       <packagereq type="mandatory">pavucontrol</packagereq>
+      <packagereq type="mandatory">pulseaudio-utils</packagereq>
       <packagereq type="mandatory">volumeicon</packagereq>
-      <packagereq type="mandatory">brightnessctl</packagereq>
       <packagereq type="default">azote</packagereq>
       <packagereq type="default">dmenu</packagereq>
       <packagereq type="default">firefox</packagereq>
@@ -3114,6 +3114,13 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="mandatory">plasma-desktop</packagereq>
+      <packagereq type="mandatory">plasma-workspace</packagereq>
+      <packagereq type="mandatory">qt5-qtbase-gui</packagereq>
+      <packagereq type="mandatory">sddm</packagereq>
+      <packagereq type="mandatory">sddm-breeze</packagereq>
+      <packagereq type="mandatory">sddm-kcm</packagereq>
+      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
       <packagereq type="default">abrt-desktop</packagereq>
       <packagereq type="default">adwaita-gtk2-theme</packagereq>
       <packagereq type="default">akregator</packagereq>
@@ -3196,13 +3203,6 @@
       <packagereq type="default">qt5-qtdeclarative</packagereq>
       <packagereq type="default">spectacle</packagereq>
       <packagereq type="default">xorg-x11-drv-libinput</packagereq>
-      <packagereq type="mandatory">plasma-desktop</packagereq>
-      <packagereq type="mandatory">plasma-workspace</packagereq>
-      <packagereq type="mandatory">qt5-qtbase-gui</packagereq>
-      <packagereq type="mandatory">sddm</packagereq>
-      <packagereq type="mandatory">sddm-breeze</packagereq>
-      <packagereq type="mandatory">sddm-kcm</packagereq>
-      <packagereq type="conditional" requires="at-spi2-core">qt-at-spi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3869,9 +3869,9 @@
       <packagereq>vim-enhanced</packagereq>
       <packagereq>wireplumber</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
+      <packagereq>xfburn</packagereq>
       <packagereq>xmodmap</packagereq>
       <packagereq>xrdb</packagereq>
-      <packagereq>xfburn</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq type="default">fedora-release-matecompiz</packagereq>
     </packagelist>