From c88d9b79508b2f3f02ed3c77abef6e6333baa5fc Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Wed, 1 May 2024 22:35:32 +0300
Subject: [PATCH] Update for Final MSVSphere 9.4

---
 comps.xml               |  1 +
 msvsphere-9.conf        |  6 +++---
 msvsphere/multilib.conf | 16 ++++++++++++++++
 variants-i686.xml       |  2 ++
 variants.xml            |  2 ++
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/comps.xml b/comps.xml
index cce6e4b..d4fa77a 100644
--- a/comps.xml
+++ b/comps.xml
@@ -2396,6 +2396,7 @@
       <packagereq variant="CRB" type="default">doxygen</packagereq>
       <packagereq variant="CRB" type="default">doxygen-doxywizard</packagereq>
       <packagereq variant="CRB" type="default">doxygen-latex</packagereq>
+      <packagereq variant="CRB" type="default">dpdk-devel</packagereq>
       <packagereq variant="CRB" type="default">dtc</packagereq>
       <packagereq variant="CRB" type="default">dwarves</packagereq>
       <packagereq variant="CRB" type="default">dyninst-devel</packagereq>
diff --git a/msvsphere-9.conf b/msvsphere-9.conf
index 5a89aa5..0695b7b 100644
--- a/msvsphere-9.conf
+++ b/msvsphere-9.conf
@@ -20,7 +20,7 @@ extra_isos = {
     "BaseOS": [{
         "include_variants": ["AppStream", "Extras"],
         #"filename": "{compose_id}-{arch}-{disc_type}{disc_num}{suffix}",
-        "filename": "{release_short}-9.4-Beta-{arch}-{disc_type}{suffix}",
+        "filename": "{release_short}-9.4-{arch}-{disc_type}{suffix}",
         "skip_src": True,
         "arches": ['x86_64'],
         "failable_arches": ['i386'],
@@ -39,7 +39,7 @@ extra_isos = {
     }],
     "Minimal": [{
         "include_variants": [],
-        "filename": "{release_short}-9.4-Beta-{arch}-minimal{suffix}",
+        "filename": "{release_short}-9.4-{arch}-minimal{suffix}",
         "skip_src": True,
         "arches": ['x86_64'],
         "failable_arches": ['i386'],
@@ -57,7 +57,7 @@ extra_isos = {
     }],
     "Server": [{
         "include_variants": [],
-        "filename": "{release_short}-9.4-Beta-{arch}-server{suffix}",
+        "filename": "{release_short}-9.4-{arch}-server{suffix}",
         "skip_src": True,
         "arches": ['x86_64'],
         "failable_arches": ['i386'],
diff --git a/msvsphere/multilib.conf b/msvsphere/multilib.conf
index 1beb444..4e56ec9 100644
--- a/msvsphere/multilib.conf
+++ b/msvsphere/multilib.conf
@@ -33,6 +33,22 @@ multilib_blacklist = {
         "tcl*",
         "ldns-devel*", #RhBug 2058694
         "postgresql*", #ENGCMP-2185
+        "bash*", #RhBug 2006138
+        "xapian-core*", #RhBug 2031780
+        "tk*", #RhBug 2053406
+        "tcl*",
+        "ldns-devel*", #RhBug 2058694
+        "apr-util-openssl",
+        "compiler-rt",
+        "libomp",
+        "librevenge-gdb",
+        "tracker",
+        "tracker-miners",
+        "gnome-software-devel",
+        "gnome-software",
+        "libfastjson-devel",
+        "liblognorm-devel",
+        "librelp-devel",
     ],
 }
 
diff --git a/variants-i686.xml b/variants-i686.xml
index 336e93b..5b3e95c 100644
--- a/variants-i686.xml
+++ b/variants-i686.xml
@@ -285,6 +285,7 @@
     </groups>
     <modules>
       <module>javapackages-tools-devel:202201</module>
+      <module>mariadb-devel:10.11</module>
       <module>nginx-devel:1.22</module>
       <module>nginx-devel:1.24</module>
       <module>nodejs-devel:18</module>
@@ -295,6 +296,7 @@
       <module>postgresql-devel:16</module>
       <module>redis-devel:7</module>
       <module>ruby-devel:3.1</module>
+      <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>
     </modules>
   </variant>
diff --git a/variants.xml b/variants.xml
index 33fa0b4..cd33699 100644
--- a/variants.xml
+++ b/variants.xml
@@ -286,6 +286,7 @@
     <modules>
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>
+      <module>mariadb-devel:10.11</module>
       <module>maven-devel:3.8</module>
       <module>nginx-devel:1.22</module>
       <module>nginx-devel:1.24</module>
@@ -297,6 +298,7 @@
       <module>postgresql-devel:16</module>
       <module>redis-devel:7</module>
       <module>ruby-devel:3.1</module>
+      <module>ruby-devel:3.3</module>
       <module>swig-devel:4.1</module>
     </modules>
   </variant>