From 353cb9d7b70faf35b32f4b64c2ecee712a357e6f Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 20 Jan 2025 12:51:26 -0700
Subject: [PATCH] change redhat-flatpak to rocky-flatpak
---
comps-rocky-10-lh.xml | 6 +++---
comps-rocky-10-lh.xml.in | 6 +++---
scripts/sync-from-upstream-10 | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index ef77c7a..7128105 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">redhat-flatpak-repo</packagereq>
+ <packagereq variant="AppStream">rocky-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">redhat-flatpak-preinstall-thunderbird</packagereq>
+ <packagereq type="optional">rocky-flatpak-preinstall-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>rocky-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 e0ef275..2fc1f90 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">redhat-flatpak-repo</packagereq>
+ <packagereq variant="AppStream">rocky-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">redhat-flatpak-preinstall-thunderbird</packagereq>
+ <packagereq type="optional">rocky-flatpak-preinstall-thunderbird</packagereq>
</packagelist>
</group>
<group variant="AppStream">
@@ -2045,7 +2045,7 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
- <packagereq>redhat-flatpak-preinstall-firefox</packagereq>
+ <packagereq>rocky-flatpak-preinstall-firefox</packagereq>
</packagelist>
</group>
<group variant="AppStream">
diff --git a/scripts/sync-from-upstream-10 b/scripts/sync-from-upstream-10
index 3e1fe31..b7b4b16 100755
--- a/scripts/sync-from-upstream-10
+++ b/scripts/sync-from-upstream-10
@@ -18,6 +18,7 @@ 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
--
GitLab