diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml index 62c065a..614dc66 100644 --- a/comps-rocky-10-lh.xml +++ b/comps-rocky-10-lh.xml @@ -412,7 +412,7 @@ PackageKit-command-not-found PackageKit-gtk3-module sane-backends-drivers-scanners - system-backgrounds + rocky-backgrounds tracker tracker-miners xdg-desktop-portal @@ -2304,8 +2304,6 @@ aqute-bndlib asciidoc-doc aspell-devel - atkmm-devel - atkmm-doc augeas-devel autoconf-archive avahi-compat-howl @@ -2345,8 +2343,6 @@ brlapi-devel brotli-devel bsf - cairomm-devel - cairomm-doc cairomm1.16-devel cairomm1.16-doc capstone-devel @@ -2449,8 +2445,6 @@ glibc-benchtests glibc-nss-devel glibc-static - glibmm2.4-devel - glibmm2.4-doc glibmm2.68-devel glibmm2.68-doc glslang-devel @@ -2474,8 +2468,6 @@ gtk3-devel-docs gtk4-devel-docs gtk-doc - gtkmm3.0-devel - gtkmm3.0-doc gtkmm4.0-devel gtkmm4.0-doc hamcrest @@ -2662,8 +2654,6 @@ libservicelog-devel libshaderc-devel libshout-devel - libsigc++20-devel - libsigc++20-doc libsigc++30-devel libsigc++30-doc libslirp-devel @@ -2891,8 +2881,6 @@ osgi-core PackageKit-glib-devel pam_wrapper - pangomm-devel - pangomm-doc pangomm2.48-devel pangomm2.48-doc papi-testsuite diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in index 47cc840..440d32e 100644 --- a/comps-rocky-10-lh.xml.in +++ b/comps-rocky-10-lh.xml.in @@ -415,7 +415,9 @@ PackageKit-command-not-found PackageKit-gtk3-module sane-backends-drivers-scanners - system-backgrounds + redhat-backgrounds + rocky-backgrounds + centos-backgrounds tracker tracker-miners xdg-desktop-portal @@ -2529,8 +2531,6 @@ aqute-bndlib asciidoc-doc aspell-devel - atkmm-devel - atkmm-doc augeas-devel autoconf-archive avahi-compat-howl @@ -2570,8 +2570,6 @@ brlapi-devel brotli-devel bsf - cairomm-devel - cairomm-doc cairomm1.16-devel cairomm1.16-doc capstone-devel @@ -2674,8 +2672,6 @@ glibc-benchtests glibc-nss-devel glibc-static - glibmm2.4-devel - glibmm2.4-doc glibmm2.68-devel glibmm2.68-doc glslang-devel @@ -2699,8 +2695,6 @@ gtk3-devel-docs gtk4-devel-docs gtk-doc - gtkmm3.0-devel - gtkmm3.0-doc gtkmm4.0-devel gtkmm4.0-doc hamcrest @@ -2887,8 +2881,6 @@ libservicelog-devel libshaderc-devel libshout-devel - libsigc++20-devel - libsigc++20-doc libsigc++30-devel libsigc++30-doc libslirp-devel @@ -3116,8 +3108,6 @@ osgi-core PackageKit-glib-devel pam_wrapper - pangomm-devel - pangomm-doc pangomm2.48-devel pangomm2.48-doc papi-testsuite diff --git a/scripts/sync-from-upstream-10 b/scripts/sync-from-upstream-10 index a5d6e4a..c31310d 100755 --- a/scripts/sync-from-upstream-10 +++ b/scripts/sync-from-upstream-10 @@ -32,6 +32,14 @@ done <redhat-backgrounds<\/packagereq><\/rhel_only>/ s/$/\n 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;"