sync from upstream

comps-rocky-10-lh.xml

@@ -1968,7 +1968,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq>
+      <packagereq type="optional">thunderbird</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -1978,7 +1978,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
+      <packagereq>firefox</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">

comps-rocky-10-lh.xml.in

@@ -2035,7 +2035,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq>
+      <rhel_only><packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq></rhel_only>
+      <centos_only><packagereq type="optional">thunderbird</packagereq></centos_only>
+      <rocky_only><packagereq type="optional">thunderbird</packagereq></rocky_only>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -2045,7 +2047,9 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
+      <rhel_only><packagereq>redhat-flatpak-preinstall-firefox</packagereq></rhel_only>
+      <centos_only><packagereq>firefox</packagereq></centos_only>
+      <rocky_only><packagereq>firefox</packagereq></rocky_only>
     </packagelist>
   </group>
   <group variant="AppStream">

scripts/sync-from-upstream-10

@@ -36,8 +36,8 @@ echo "Making sure some packages are Rocky Linux and CentOS only"
 while read -r pattern; do
   cscript+="$pattern;"
 done <<EOF
-/<centos_only><packagereq>firefox<\/packagereq><\/centos_only>/ s/$/\n            <rocky_only><packagereq>firefox<\/packagereq><\/rocky_only>/g
-/<centos_only><packagereq type="optional">thunderbird<\/packagereq><\/centos_only>/ s/$/\n            <rocky_only><packagereq type="optional">thunderbird<\/packagereq><\/rocky_only>/g
+/<centos_only><packagereq>firefox<\/packagereq><\/centos_only>/ s/$/\n      <rocky_only><packagereq>firefox<\/packagereq><\/rocky_only>/g
+/<centos_only><packagereq type="optional">thunderbird<\/packagereq><\/centos_only>/ s/$/\n      <rocky_only><packagereq type="optional">thunderbird<\/packagereq><\/rocky_only>/g
 EOF
 sed -Ei "$cscript" "${COMPS_ROCKY}"