diff --git a/comps-f35.xml.in b/comps-f35.xml.in
index 0517bc3d..5a22a95d 100644
--- a/comps-f35.xml.in
+++ b/comps-f35.xml.in
@@ -797,9 +797,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>freeipa-server</packagereq>
       <packagereq>bind-dyndb-ldap</packagereq>
       <packagereq>cockpit</packagereq>
+      <packagereq>freeipa-server</packagereq>
       <packagereq>freeipa-server-dns</packagereq>
       <packagereq>freeipa-server-trust-ad</packagereq>
       <packagereq>opendnssec</packagereq>
diff --git a/comps-f36.xml.in b/comps-f36.xml.in
index 7431c7b0..ab6d3e04 100644
--- a/comps-f36.xml.in
+++ b/comps-f36.xml.in
@@ -797,9 +797,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>freeipa-server</packagereq>
       <packagereq>bind-dyndb-ldap</packagereq>
       <packagereq>cockpit</packagereq>
+      <packagereq>freeipa-server</packagereq>
       <packagereq>freeipa-server-dns</packagereq>
       <packagereq>freeipa-server-trust-ad</packagereq>
       <packagereq>opendnssec</packagereq>
diff --git a/comps-f37.xml.in b/comps-f37.xml.in
index 9a758efe..46be758f 100644
--- a/comps-f37.xml.in
+++ b/comps-f37.xml.in
@@ -788,9 +788,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>freeipa-server</packagereq>
       <packagereq>bind-dyndb-ldap</packagereq>
       <packagereq>cockpit</packagereq>
+      <packagereq>freeipa-server</packagereq>
       <packagereq>freeipa-server-dns</packagereq>
       <packagereq>freeipa-server-trust-ad</packagereq>
       <packagereq>opendnssec</packagereq>
diff --git a/comps-f38.xml.in b/comps-f38.xml.in
index 618a21c7..33d2d6e0 100644
--- a/comps-f38.xml.in
+++ b/comps-f38.xml.in
@@ -773,9 +773,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>freeipa-server</packagereq>
       <packagereq>bind-dyndb-ldap</packagereq>
       <packagereq>cockpit</packagereq>
+      <packagereq>freeipa-server</packagereq>
       <packagereq>freeipa-server-dns</packagereq>
       <packagereq>freeipa-server-trust-ad</packagereq>
       <packagereq>opendnssec</packagereq>
@@ -3972,7 +3972,6 @@
       <packagereq type="default">mingw32-crossreport</packagereq>
       <packagereq type="default">mingw32-nsis</packagereq>
       <packagereq arch="aarch64,x86_64" type="default">wine</packagereq>
-      <packagereq type="optional">mingw32-sdl12-compat</packagereq>
       <packagereq type="optional">mingw32-atk</packagereq>
       <packagereq type="optional">mingw32-bzip2</packagereq>
       <packagereq type="optional">mingw32-cairo</packagereq>
@@ -3991,6 +3990,7 @@
       <packagereq type="optional">mingw32-pixman</packagereq>
       <packagereq type="optional">mingw32-proj</packagereq>
       <packagereq type="optional">mingw32-readline</packagereq>
+      <packagereq type="optional">mingw32-sdl12-compat</packagereq>
       <packagereq type="optional">mingw32-sqlite</packagereq>
       <packagereq type="optional">mingw32-termcap</packagereq>
       <packagereq type="optional">mingw32-win-iconv</packagereq>