From f94c1c991d8ed4cbde64a9d76077e0559a4e1eeb Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 25 Nov 2024 19:40:15 +0300
Subject: [PATCH] Added langpacs to Server and Minimal variants

---
 comps-aarch64.xml                          | 1 -
 comps.xml                                  | 1 -
 msvsphere-aarch64/additional_packages.conf | 8 ++++++--
 msvsphere/additional_packages.conf         | 8 ++++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/comps-aarch64.xml b/comps-aarch64.xml
index c2c7223..57f792e 100644
--- a/comps-aarch64.xml
+++ b/comps-aarch64.xml
@@ -2147,7 +2147,6 @@
       <packagereq variant="Minimal" type="mandatory">filesystem</packagereq>
       <packagereq variant="Minimal" type="mandatory">firewalld</packagereq>
       <packagereq variant="Minimal" type="mandatory">glibc</packagereq>
-      <packagereq variant="Minimal" type="mandatory">glibc-all-langpacks</packagereq>
       <packagereq variant="Minimal" type="mandatory">grubby</packagereq>
       <packagereq variant="Minimal" type="mandatory">hostname</packagereq>
       <packagereq variant="Minimal" type="mandatory">initscripts</packagereq>
diff --git a/comps.xml b/comps.xml
index 1c96880..026312d 100644
--- a/comps.xml
+++ b/comps.xml
@@ -2199,7 +2199,6 @@
       <packagereq variant="Minimal" type="mandatory">filesystem</packagereq>
       <packagereq variant="Minimal" type="mandatory">firewalld</packagereq>
       <packagereq variant="Minimal" type="mandatory">glibc</packagereq>
-      <packagereq variant="Minimal" type="mandatory">glibc-all-langpacks</packagereq>
       <packagereq variant="Minimal" type="mandatory">grubby</packagereq>
       <packagereq variant="Minimal" type="mandatory">hostname</packagereq>
       <packagereq variant="Minimal" type="mandatory">initscripts</packagereq>
diff --git a/msvsphere-aarch64/additional_packages.conf b/msvsphere-aarch64/additional_packages.conf
index e10c873..9ca53ae 100644
--- a/msvsphere-aarch64/additional_packages.conf
+++ b/msvsphere-aarch64/additional_packages.conf
@@ -20,7 +20,9 @@ additional_packages = [
                 "glibc-gconv-extra",
                 "libsss_autofs",
                 "sssd-nfs-idmap",
-                "kbd-legacy"
+                "kbd-legacy",
+                "langpacks-*",
+                "glibc-langpack-*"
             ]
         }
     ),
@@ -111,7 +113,9 @@ additional_packages = [
                 "container-selinux",
                 "flatpak-selinux",
                 "libdecor",
-                "ibus-gtk2"
+                "ibus-gtk2",
+                "langpacks-*",
+                "glibc-langpack-*"
             ]
         }
     )
diff --git a/msvsphere/additional_packages.conf b/msvsphere/additional_packages.conf
index 38ad095..50af5de 100644
--- a/msvsphere/additional_packages.conf
+++ b/msvsphere/additional_packages.conf
@@ -20,7 +20,9 @@ additional_packages = [
                 "glibc-gconv-extra.i686",
                 "libsss_autofs",
                 "sssd-nfs-idmap",
-                "kbd-legacy"
+                "kbd-legacy",
+                "langpacks-*",
+                "glibc-langpack-*"
             ]
         }
     ),
@@ -111,7 +113,9 @@ additional_packages = [
                 "container-selinux",
                 "flatpak-selinux",
                 "libdecor",
-                "ibus-gtk2"
+                "ibus-gtk2",
+                "langpacks-*",
+                "glibc-langpack-*"
             ]
         }
     )