From 0570c6b2f059ce520cc7963576b6c95177218a42 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Wed, 22 Feb 2023 11:32:27 +0800 Subject: [PATCH] remove glibc-langpack-minimal add glibc-langpack-en/zh as suggests for glibc Signed-off-by: Chunmei Xu --- glibc.spec | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/glibc.spec b/glibc.spec index d293dea..334fbd4 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 %bcond_without testsuite # Default: Always build the benchtests. @@ -328,7 +328,8 @@ BuildRequires: perl-interpreter # Today you must actively use the language packs infrastructure to # install language support. Requires: glibc-langpack = %{version}-%{release} -Suggests: glibc-minimal-langpack = %{version}-%{release} +Suggests: glibc-langpack-en = %{version}-%{release} +Suggests: glibc-langpack-zh = %{version}-%{release} # Suggest extra gconv modules so that they are installed by default but can be # removed if needed to build a minimal OS image. @@ -505,24 +506,6 @@ Requires: %{name}-common = %{version}-%{release} The glibc-langpack-zh package includes the basic information required to support the Mandarin Chinese language in your applications. - -# No %files, this is an empty package. The C/POSIX and -# C.UTF-8 files are already installed by glibc. We create -# minimal-langpack because the virtual provide of -# glibc-langpack needs at least one package installed -# to satisfy it. Given that no-locales installed is a valid -# use case we support it here with this package. -%package minimal-langpack -Summary: Minimal language packs for %{name}. -Provides: glibc-langpack = %{version}-%{release} -Requires: %{name} = %{version}-%{release} -Requires: %{name}-common = %{version}-%{release} -%description minimal-langpack -This is a Meta package that is used to install minimal language packs. -This package ensures you can use C, POSIX, or C.UTF-8 locales, but -nothing else. It is designed for assembling a minimal system. -%files minimal-langpack - # Infrequently used iconv converter modules. %package gconv-extra Summary: All iconv converter modules for %{name}. @@ -1736,6 +1719,10 @@ update_gconv_modules_cache () %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Wed Feb 22 2023 Chunmei Xu - 2.36-4 +- remove glibc-langpack-minimal +- add glibc-langpack-en/zh as suggests for glibc + * Thu Jan 5 2023 Chunmei Xu - 2.36-3 - sync patches from 2.36 release branch, upstream commit 4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c - move glibc-langpack-xxx subpackage to glibc-all-langpacks except glibc-langpack-en/zh