From 186875518ed3eb20532133c203bf96d79defca93 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 22 Jan 2025 15:49:18 -0700
Subject: [PATCH] sync from upstream
---
comps-rocky-10-lh.xml | 4 ++--
comps-rocky-10-lh.xml.in | 8 ++++++--
scripts/sync-from-upstream-10 | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index ef77c7a..b955356 100644
--- a/comps-rocky-10-lh.xml
+++ b/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">
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index e0ef275..2c498a6 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/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">
diff --git a/scripts/sync-from-upstream-10 b/scripts/sync-from-upstream-10
index d3a0509..eea9bb8 100755
--- a/scripts/sync-from-upstream-10
+++ b/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}"
--
GitLab