diff --git a/comps-f29.xml.in b/comps-f29.xml.in
index 1da8ef07..2e904a77 100644
--- a/comps-f29.xml.in
+++ b/comps-f29.xml.in
@@ -533,8 +533,8 @@
       <packagereq type="optional">insight</packagereq>
       <packagereq type="optional">nasm</packagereq>
       <packagereq type="optional">pscan</packagereq>
-      <packagereq type="optional">remake</packagereq>
       <packagereq type="optional">python2-scons</packagereq>
+      <packagereq type="optional">remake</packagereq>
       <packagereq type="optional">scorep</packagereq>
       <packagereq type="optional">splint</packagereq>
       <packagereq type="optional">trinity</packagereq>
@@ -1092,7 +1092,6 @@
       <packagereq type="optional">dejagnu</packagereq>
       <packagereq type="optional">expect</packagereq>
       <packagereq type="optional">gambas3-ide</packagereq>
-      <packagereq type="optional">gitg</packagereq>
       <packagereq type="optional">git-annex</packagereq>
       <packagereq type="optional">git-cola</packagereq>
       <packagereq type="optional">git2cl</packagereq>
@@ -1603,8 +1602,6 @@
       <packagereq type="optional">ginac</packagereq>
       <packagereq type="optional">glimmer</packagereq>
       <packagereq type="optional">GMT</packagereq>
-      <packagereq type="optional">gshhg-gmt-nc4-full</packagereq>
-      <packagereq type="optional">gshhg-gmt-nc4-high</packagereq>
       <packagereq type="optional">GMT-doc</packagereq>
       <packagereq type="optional">gnome-chemistry-utils</packagereq>
       <packagereq type="optional">gpredict</packagereq>
@@ -1612,6 +1609,8 @@
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gromacs</packagereq>
       <packagereq type="optional">gromacs-openmpi</packagereq>
+      <packagereq type="optional">gshhg-gmt-nc4-full</packagereq>
+      <packagereq type="optional">gshhg-gmt-nc4-high</packagereq>
       <packagereq type="optional">gts</packagereq>
       <packagereq type="optional">hdf</packagereq>
       <packagereq type="optional">hdf5</packagereq>
@@ -1649,12 +1648,12 @@
       <packagereq type="optional">picosat</packagereq>
       <packagereq type="optional">picosat-devel</packagereq>
       <packagereq type="optional">plotutils</packagereq>
-      <packagereq type="optional">brial</packagereq>
       <packagereq type="optional">polymake</packagereq>
       <packagereq type="optional">pvs-sbcl</packagereq>
       <packagereq type="optional">python3-biopython</packagereq>
       <packagereq type="optional">python3-cvxopt</packagereq>
       <packagereq type="optional">python3-networkx</packagereq>
+      <packagereq type="optional">python3-sympy</packagereq>
       <packagereq type="optional">python3-theano</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>
@@ -1670,7 +1669,6 @@
       <packagereq type="optional">stix-math-fonts</packagereq>
       <packagereq type="optional">stp</packagereq>
       <packagereq type="optional">symmetrica</packagereq>
-      <packagereq type="optional">python3-sympy</packagereq>
       <packagereq type="optional">tcd-utils</packagereq>
       <packagereq type="optional">TeXmacs</packagereq>
       <packagereq type="optional">tgif</packagereq>
@@ -1817,8 +1815,8 @@
       <packagereq type="optional">gbdfed</packagereq>
       <packagereq type="optional">ghostscript-doc</packagereq>
       <packagereq type="optional">ghostscript-gtk</packagereq>
-      <packagereq type="optional">gitg</packagereq>
       <packagereq type="optional">git</packagereq>
+      <packagereq type="optional">gitg</packagereq>
       <packagereq type="optional">meld</packagereq>
       <packagereq type="optional">mercurial</packagereq>
       <packagereq type="optional">python3-fontMath</packagereq>
diff --git a/comps-f30.xml.in b/comps-f30.xml.in
index 982e329b..b4ad739e 100644
--- a/comps-f30.xml.in
+++ b/comps-f30.xml.in
@@ -533,8 +533,8 @@
       <packagereq type="optional">insight</packagereq>
       <packagereq type="optional">nasm</packagereq>
       <packagereq type="optional">pscan</packagereq>
-      <packagereq type="optional">remake</packagereq>
       <packagereq type="optional">python2-scons</packagereq>
+      <packagereq type="optional">remake</packagereq>
       <packagereq type="optional">scorep</packagereq>
       <packagereq type="optional">splint</packagereq>
       <packagereq type="optional">trinity</packagereq>
@@ -1092,7 +1092,6 @@
       <packagereq type="optional">dejagnu</packagereq>
       <packagereq type="optional">expect</packagereq>
       <packagereq type="optional">gambas3-ide</packagereq>
-      <packagereq type="optional">gitg</packagereq>
       <packagereq type="optional">git-annex</packagereq>
       <packagereq type="optional">git-cola</packagereq>
       <packagereq type="optional">git2cl</packagereq>
@@ -1603,8 +1602,6 @@
       <packagereq type="optional">ginac</packagereq>
       <packagereq type="optional">glimmer</packagereq>
       <packagereq type="optional">GMT</packagereq>
-      <packagereq type="optional">gshhg-gmt-nc4-full</packagereq>
-      <packagereq type="optional">gshhg-gmt-nc4-high</packagereq>
       <packagereq type="optional">GMT-doc</packagereq>
       <packagereq type="optional">gnome-chemistry-utils</packagereq>
       <packagereq type="optional">gpredict</packagereq>
@@ -1612,6 +1609,8 @@
       <packagereq type="optional">grads</packagereq>
       <packagereq type="optional">gromacs</packagereq>
       <packagereq type="optional">gromacs-openmpi</packagereq>
+      <packagereq type="optional">gshhg-gmt-nc4-full</packagereq>
+      <packagereq type="optional">gshhg-gmt-nc4-high</packagereq>
       <packagereq type="optional">gts</packagereq>
       <packagereq type="optional">hdf</packagereq>
       <packagereq type="optional">hdf5</packagereq>
@@ -1649,12 +1648,12 @@
       <packagereq type="optional">picosat</packagereq>
       <packagereq type="optional">picosat-devel</packagereq>
       <packagereq type="optional">plotutils</packagereq>
-      <packagereq type="optional">brial</packagereq>
       <packagereq type="optional">polymake</packagereq>
       <packagereq type="optional">pvs-sbcl</packagereq>
       <packagereq type="optional">python3-biopython</packagereq>
       <packagereq type="optional">python3-cvxopt</packagereq>
       <packagereq type="optional">python3-networkx</packagereq>
+      <packagereq type="optional">python3-sympy</packagereq>
       <packagereq type="optional">python3-theano</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>
@@ -1670,7 +1669,6 @@
       <packagereq type="optional">stix-math-fonts</packagereq>
       <packagereq type="optional">stp</packagereq>
       <packagereq type="optional">symmetrica</packagereq>
-      <packagereq type="optional">python3-sympy</packagereq>
       <packagereq type="optional">tcd-utils</packagereq>
       <packagereq type="optional">TeXmacs</packagereq>
       <packagereq type="optional">tgif</packagereq>
@@ -1817,8 +1815,8 @@
       <packagereq type="optional">gbdfed</packagereq>
       <packagereq type="optional">ghostscript-doc</packagereq>
       <packagereq type="optional">ghostscript-gtk</packagereq>
-      <packagereq type="optional">gitg</packagereq>
       <packagereq type="optional">git</packagereq>
+      <packagereq type="optional">gitg</packagereq>
       <packagereq type="optional">meld</packagereq>
       <packagereq type="optional">mercurial</packagereq>
       <packagereq type="optional">python3-fontMath</packagereq>