From 515d3ecf586749b6fe5e82dd2cd80fed88043f37 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 22 Jan 2025 01:31:14 -0700
Subject: [PATCH] Ensure firefox and thunderbird are also rocky only
---
comps-rocky-10-lh.xml | 6 +++---
comps-rocky-10-lh.xml.in | 6 +++---
scripts/sync-from-upstream-10 | 10 +++++++++-
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 7128105..ef77c7a 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -415,7 +415,7 @@
<packagereq variant="AppStream">plymouth-system-theme</packagereq>
<packagereq variant="AppStream">sane-backends-drivers-scanners</packagereq>
<packagereq variant="AppStream">rocky-backgrounds</packagereq>
- <packagereq variant="AppStream">rocky-flatpak-repo</packagereq>
+ <packagereq variant="AppStream">redhat-flatpak-repo</packagereq>
<packagereq variant="AppStream">tracker</packagereq>
<packagereq variant="AppStream">tracker-miners</packagereq>
<packagereq variant="AppStream">xdg-desktop-portal</packagereq>
@@ -1968,7 +1968,7 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="optional">rocky-flatpak-preinstall-thunderbird</packagereq>
+ <packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq>
</packagelist>
</group>
<group variant="AppStream">
@@ -1978,7 +1978,7 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
- <packagereq>rocky-flatpak-preinstall-firefox</packagereq>
+ <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
</packagelist>
</group>
<group variant="AppStream">
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 2fc1f90..e0ef275 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -421,7 +421,7 @@
<rhel_only><packagereq variant="AppStream">redhat-backgrounds</packagereq></rhel_only>
<rocky_only><packagereq variant="AppStream">rocky-backgrounds</packagereq></rocky_only>
<centos_only><packagereq variant="AppStream">centos-backgrounds</packagereq></centos_only>
- <packagereq variant="AppStream">rocky-flatpak-repo</packagereq>
+ <packagereq variant="AppStream">redhat-flatpak-repo</packagereq>
<packagereq variant="AppStream">tracker</packagereq>
<packagereq variant="AppStream">tracker-miners</packagereq>
<packagereq variant="AppStream">xdg-desktop-portal</packagereq>
@@ -2035,7 +2035,7 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
- <packagereq type="optional">rocky-flatpak-preinstall-thunderbird</packagereq>
+ <packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq>
</packagelist>
</group>
<group variant="AppStream">
@@ -2045,7 +2045,7 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
- <packagereq>rocky-flatpak-preinstall-firefox</packagereq>
+ <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
</packagelist>
</group>
<group variant="AppStream">
diff --git a/scripts/sync-from-upstream-10 b/scripts/sync-from-upstream-10
index b7b4b16..d3a0509 100755
--- a/scripts/sync-from-upstream-10
+++ b/scripts/sync-from-upstream-10
@@ -18,7 +18,6 @@ while read -r pattern; do
sscript+="$pattern;"
done <<EOF
s/>redhat-release/>rocky-release/g
-s/>redhat-flatpak/>rocky-flatpak/g
s/Red Hat Enterprise Linux/Rocky Linux/g
s/RHEL/Rocky Linux/g
s/Red Hat, Inc./Rocky Enterprise Software Foundation/g
@@ -33,6 +32,15 @@ sed -i "$sscript" "${COMPS_ROCKY}"
#EOF
#sed -Ei "$mscript" "${COMPS_ROCKY}"
+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
+EOF
+sed -Ei "$cscript" "${COMPS_ROCKY}"
+
echo "Making sure some packages are RHEL only"
while read -r pattern; do
bscript+="$pattern;"
--
GitLab