sync from upstream

comps-rocky-10-lh.xml

@@ -412,7 +412,7 @@
       <packagereq variant="AppStream">PackageKit-command-not-found</packagereq>
       <packagereq variant="AppStream">PackageKit-gtk3-module</packagereq>
       <packagereq variant="AppStream">sane-backends-drivers-scanners</packagereq>
-      <packagereq variant="AppStream">system-backgrounds</packagereq>
+      <packagereq variant="AppStream">rocky-backgrounds</packagereq>
       <packagereq variant="AppStream">tracker</packagereq>
       <packagereq variant="AppStream">tracker-miners</packagereq>
       <packagereq variant="AppStream">xdg-desktop-portal</packagereq>
@@ -2304,8 +2304,6 @@
       <packagereq type="default">aqute-bndlib</packagereq>
       <packagereq type="default">asciidoc-doc</packagereq>
       <packagereq type="default">aspell-devel</packagereq>
-      <packagereq type="default">atkmm-devel</packagereq>
-      <packagereq type="default">atkmm-doc</packagereq>
       <packagereq type="default">augeas-devel</packagereq>
       <packagereq type="default">autoconf-archive</packagereq>
       <packagereq type="default">avahi-compat-howl</packagereq>
@@ -2345,8 +2343,6 @@
       <packagereq type="default">brlapi-devel</packagereq>
       <packagereq type="default">brotli-devel</packagereq>
       <packagereq type="default">bsf</packagereq>
-      <packagereq type="default">cairomm-devel</packagereq>
-      <packagereq type="default">cairomm-doc</packagereq>
       <packagereq type="default">cairomm1.16-devel</packagereq>
       <packagereq type="default">cairomm1.16-doc</packagereq>
       <packagereq type="default">capstone-devel</packagereq>
@@ -2449,8 +2445,6 @@
       <packagereq type="default">glibc-benchtests</packagereq>
       <packagereq type="default">glibc-nss-devel</packagereq>
       <packagereq type="default">glibc-static</packagereq>
-      <packagereq type="default">glibmm2.4-devel</packagereq>
-      <packagereq type="default">glibmm2.4-doc</packagereq>
       <packagereq type="default">glibmm2.68-devel</packagereq>
       <packagereq type="default">glibmm2.68-doc</packagereq>
       <packagereq type="default">glslang-devel</packagereq>
@@ -2474,8 +2468,6 @@
       <packagereq type="default">gtk3-devel-docs</packagereq>
       <packagereq type="default">gtk4-devel-docs</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
-      <packagereq type="default">gtkmm3.0-devel</packagereq>
-      <packagereq type="default">gtkmm3.0-doc</packagereq>
       <packagereq type="default">gtkmm4.0-devel</packagereq>
       <packagereq type="default">gtkmm4.0-doc</packagereq>
       <packagereq type="default">hamcrest</packagereq>
@@ -2662,8 +2654,6 @@
       <packagereq type="default" arch="ppc64le">libservicelog-devel</packagereq>
       <packagereq type="default">libshaderc-devel</packagereq>
       <packagereq type="default">libshout-devel</packagereq>
-      <packagereq type="default">libsigc++20-devel</packagereq>
-      <packagereq type="default">libsigc++20-doc</packagereq>
       <packagereq type="default">libsigc++30-devel</packagereq>
       <packagereq type="default">libsigc++30-doc</packagereq>
       <packagereq type="default">libslirp-devel</packagereq>
@@ -2891,8 +2881,6 @@
       <packagereq type="default">osgi-core</packagereq>
       <packagereq type="default">PackageKit-glib-devel</packagereq>
       <packagereq type="default">pam_wrapper</packagereq>
-      <packagereq type="default">pangomm-devel</packagereq>
-      <packagereq type="default">pangomm-doc</packagereq>
       <packagereq type="default">pangomm2.48-devel</packagereq>
       <packagereq type="default">pangomm2.48-doc</packagereq>
       <packagereq type="default" arch="aarch64,ppc64le,x86_64">papi-testsuite</packagereq>

comps-rocky-10-lh.xml.in

@@ -415,7 +415,9 @@
       <packagereq variant="AppStream">PackageKit-command-not-found</packagereq>
       <packagereq variant="AppStream">PackageKit-gtk3-module</packagereq>
       <packagereq variant="AppStream">sane-backends-drivers-scanners</packagereq>
-      <packagereq variant="AppStream">system-backgrounds</packagereq>
+      <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">tracker</packagereq>
       <packagereq variant="AppStream">tracker-miners</packagereq>
       <packagereq variant="AppStream">xdg-desktop-portal</packagereq>
@@ -2529,8 +2531,6 @@
       <packagereq type="default">aqute-bndlib</packagereq>
       <packagereq type="default">asciidoc-doc</packagereq>
       <packagereq type="default">aspell-devel</packagereq>
-      <packagereq type="default">atkmm-devel</packagereq>
-      <packagereq type="default">atkmm-doc</packagereq>
       <packagereq type="default">augeas-devel</packagereq>
       <packagereq type="default">autoconf-archive</packagereq>
       <packagereq type="default">avahi-compat-howl</packagereq>
@@ -2570,8 +2570,6 @@
       <packagereq type="default">brlapi-devel</packagereq>
       <packagereq type="default">brotli-devel</packagereq>
       <packagereq type="default">bsf</packagereq>
-      <packagereq type="default">cairomm-devel</packagereq>
-      <packagereq type="default">cairomm-doc</packagereq>
       <packagereq type="default">cairomm1.16-devel</packagereq>
       <packagereq type="default">cairomm1.16-doc</packagereq>
       <packagereq type="default">capstone-devel</packagereq>
@@ -2674,8 +2672,6 @@
       <packagereq type="default">glibc-benchtests</packagereq>
       <packagereq type="default">glibc-nss-devel</packagereq>
       <packagereq type="default">glibc-static</packagereq>
-      <packagereq type="default">glibmm2.4-devel</packagereq>
-      <packagereq type="default">glibmm2.4-doc</packagereq>
       <packagereq type="default">glibmm2.68-devel</packagereq>
       <packagereq type="default">glibmm2.68-doc</packagereq>
       <packagereq type="default">glslang-devel</packagereq>
@@ -2699,8 +2695,6 @@
       <packagereq type="default">gtk3-devel-docs</packagereq>
       <packagereq type="default">gtk4-devel-docs</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
-      <packagereq type="default">gtkmm3.0-devel</packagereq>
-      <packagereq type="default">gtkmm3.0-doc</packagereq>
       <packagereq type="default">gtkmm4.0-devel</packagereq>
       <packagereq type="default">gtkmm4.0-doc</packagereq>
       <packagereq type="default">hamcrest</packagereq>
@@ -2887,8 +2881,6 @@
       <packagereq type="default" arch="ppc64le">libservicelog-devel</packagereq>
       <packagereq type="default">libshaderc-devel</packagereq>
       <packagereq type="default">libshout-devel</packagereq>
-      <packagereq type="default">libsigc++20-devel</packagereq>
-      <packagereq type="default">libsigc++20-doc</packagereq>
       <packagereq type="default">libsigc++30-devel</packagereq>
       <packagereq type="default">libsigc++30-doc</packagereq>
       <packagereq type="default">libslirp-devel</packagereq>
@@ -3116,8 +3108,6 @@
       <packagereq type="default">osgi-core</packagereq>
       <packagereq type="default">PackageKit-glib-devel</packagereq>
       <packagereq type="default">pam_wrapper</packagereq>
-      <packagereq type="default">pangomm-devel</packagereq>
-      <packagereq type="default">pangomm-doc</packagereq>
       <packagereq type="default">pangomm2.48-devel</packagereq>
       <packagereq type="default">pangomm2.48-doc</packagereq>
       <packagereq type="default" arch="aarch64,ppc64le,x86_64">papi-testsuite</packagereq>

scripts/sync-from-upstream-10

@@ -32,6 +32,14 @@ done <<EOF
 EOF
 sed -Ei "$mscript" "${COMPS_ROCKY}"
 
+echo "Making sure some packages are RHEL only"
+while read -r pattern; do
+  bscript+="$pattern;"
+done <<EOF
+/<rhel_only><packagereq variant="AppStream">redhat-backgrounds<\/packagereq><\/rhel_only>/ s/$/\n      <rocky_only><packagereq variant="AppStream">rocky-backgrounds<\/packagereq><\/rocky_only>/g
+EOF
+sed -Ei "$bscript" "${COMPS_ROCKY}"
+
 #echo "Modifications to make sure certain scenarios work"
 #while read -r pattern; do
 #  wscript+="$pattern;"