Skip to content
Snippets Groups Projects
Verified Commit 18687551 authored by Louis Abel's avatar Louis Abel :tv:
Browse files

sync from upstream

parent 515d3ecf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
comps-rocky-10-lh.xml
+ 2
− 2
View file @ 18687551
...@@ -1968,7 +1968,7 @@ ...@@ -1968,7 +1968,7 @@
<default>false</default> <default>false</default>
<uservisible>false</uservisible> <uservisible>false</uservisible>
<packagelist> <packagelist>
<packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq> <packagereq type="optional">thunderbird</packagereq>
</packagelist> </packagelist>
</group> </group>
<group variant="AppStream"> <group variant="AppStream">
...@@ -1978,7 +1978,7 @@ ...@@ -1978,7 +1978,7 @@
<default>false</default> <default>false</default>
<uservisible>false</uservisible> <uservisible>false</uservisible>
<packagelist> <packagelist>
<packagereq>redhat-flatpak-preinstall-firefox</packagereq> <packagereq>firefox</packagereq>
</packagelist> </packagelist>
</group> </group>
<group variant="AppStream"> <group variant="AppStream">
......
comps-rocky-10-lh.xml.in
+ 6
− 2
View file @ 18687551
...@@ -2035,7 +2035,9 @@ ...@@ -2035,7 +2035,9 @@
<default>false</default> <default>false</default>
<uservisible>false</uservisible> <uservisible>false</uservisible>
<packagelist> <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> </packagelist>
</group> </group>
<group variant="AppStream"> <group variant="AppStream">
...@@ -2045,7 +2047,9 @@ ...@@ -2045,7 +2047,9 @@
<default>false</default> <default>false</default>
<uservisible>false</uservisible> <uservisible>false</uservisible>
<packagelist> <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> </packagelist>
</group> </group>
<group variant="AppStream"> <group variant="AppStream">
......
scripts/sync-from-upstream-10
+ 2
− 2
View file @ 18687551
...@@ -36,8 +36,8 @@ echo "Making sure some packages are Rocky Linux and CentOS only" ...@@ -36,8 +36,8 @@ echo "Making sure some packages are Rocky Linux and CentOS only"
while read -r pattern; do while read -r pattern; do
cscript+="$pattern;" cscript+="$pattern;"
done <<EOF done <<EOF
/<centos_only><packagereq>firefox<\/packagereq><\/centos_only>/ s/$/\n <rocky_only><packagereq>firefox<\/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 /<centos_only><packagereq type="optional">thunderbird<\/packagereq><\/centos_only>/ s/$/\n <rocky_only><packagereq type="optional">thunderbird<\/packagereq><\/rocky_only>/g
EOF EOF
sed -Ei "$cscript" "${COMPS_ROCKY}" sed -Ei "$cscript" "${COMPS_ROCKY}"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment