From 70abbc5c05d984669000ec97ad09c71a6e0f5694 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 8 Oct 2024 21:27:46 +0300
Subject: [PATCH] Sync with 9.4 stable

---
 aarch64/include_exclude.conf | 1 +
 ppc64le/include_exclude.conf | 1 +
 s390x/include_exclude.conf   | 7 ++++++-
 x86_64/include_exclude.conf  | 5 ++++-
 x86_64/multilib.conf         | 5 +++++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/aarch64/include_exclude.conf b/aarch64/include_exclude.conf
index 3acb36e..658ee39 100644
--- a/aarch64/include_exclude.conf
+++ b/aarch64/include_exclude.conf
@@ -117,6 +117,7 @@ additional_packages = [
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
             ]
         }
     ),
diff --git a/ppc64le/include_exclude.conf b/ppc64le/include_exclude.conf
index 7d97486..8e8b610 100644
--- a/ppc64le/include_exclude.conf
+++ b/ppc64le/include_exclude.conf
@@ -124,6 +124,7 @@ additional_packages = [
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
             ]
         }
     ),
diff --git a/s390x/include_exclude.conf b/s390x/include_exclude.conf
index e0af1f3..1dfa79b 100644
--- a/s390x/include_exclude.conf
+++ b/s390x/include_exclude.conf
@@ -39,8 +39,9 @@ filter_packages = [
         }
     ),
     (
-        '^(BaseOS|Minimal)$', {
+        '^(BaseOS)$', {
             's390x': [
+                "perl-Net-SSLeay",
                 "perl-Mozilla-CA",
                 "perl-IO-Socket-SSL",
             ]
@@ -59,6 +60,9 @@ filter_packages = [
         '^(extras)$', {
             '*': [
                 "centos-release-*",
+                "centos-release-cloud.noarch",
+                "centos-release-ovirt45-testing.noarch",
+                "centos-release-openstack-yoga.noarch",
             ]
         }
     )
@@ -140,6 +144,7 @@ additional_packages = [
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
             ]
         }
     ),
diff --git a/x86_64/include_exclude.conf b/x86_64/include_exclude.conf
index 5ffabda..91815a6 100644
--- a/x86_64/include_exclude.conf
+++ b/x86_64/include_exclude.conf
@@ -45,8 +45,10 @@ filter_packages = [
                 "greenboot-status",
                 "qemu-kvm-hw-usbredir",
                 "subscription-manager-rhsm-certificates.x86_64",
-			    "kernel-rt-core.x86_64",
+                "kernel-rt-core.x86_64",
                 "kernel-rt-modules-core.x86_64",
+                "gnome-software-devel.i686",
+                "gnome-software.i686",
             ]
         }
     ),
@@ -133,6 +135,7 @@ additional_packages = [
                 "sssd-nfs-idmap",
                 "glibc-gconv-extra",
                 "kbd-legacy",
+                "container-selinux",
             ]
         }
     ),
diff --git a/x86_64/multilib.conf b/x86_64/multilib.conf
index 4d6eccc..f8e725d 100644
--- a/x86_64/multilib.conf
+++ b/x86_64/multilib.conf
@@ -31,6 +31,11 @@ multilib_blacklist = {
         "librevenge-gdb",
         "tracker",
         "tracker-miners",
+        "gnome-software-devel",
+        "gnome-software",
+        "libfastjson-devel",
+        "liblognorm-devel",
+        "librelp-devel",
     ],
 }
 multilib_whitelist = {}