metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

Strengthen dependency on glibc-gconv-extra

Browse Source 
Have glibc require glibc-gconv-extra for now until we figure out a way
to do this with minimal external impact.
This commit is contained in:
Siddhesh Poyarekar 2021-06-22 19:56:05 +05:30
parent c20fde6a69
commit 063fe63eaf
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glibc.spec
View File

@ -97,7 +97,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 23%{?dist} Release: 24%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for # In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries. # libraries.
@ -303,9 +303,7 @@ BuildRequires: perl-interpreter
Requires: glibc-langpack = %{version}-%{release} Requires: glibc-langpack = %{version}-%{release}
Suggests: glibc-minimal-langpack = %{version}-%{release} Suggests: glibc-minimal-langpack = %{version}-%{release}
# Suggest extra gconv modules so that they are installed by default but can be Requires: glibc-gconv-extra%{_isa} = %{version}-%{release}
# removed if needed to build a minimal OS image.
Recommends: glibc-gconv-extra = %{version}-%{release}
%description %description
The glibc package contains standard libraries which are used by The glibc package contains standard libraries which are used by
@ -823,11 +821,6 @@ Summary: All language packs for %{name}.
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Provides: %{name}-langpack = %{version}-%{release} Provides: %{name}-langpack = %{version}-%{release}
# In RPM spec files, BuildRequires: glibc-all-langpacks is used to
# indicate that a full set of locales is needed. Use
# redhat-rpm-config as a marker for a buildroot configuration, and
# unconditionally pull in glibc-gconv-extra in that case.
Requires: (glibc-gconv-extra if redhat-rpm-config)
%description all-langpacks %description all-langpacks
# No %files, this is an empty package. The C/POSIX and # No %files, this is an empty package. The C/POSIX and
@ -852,12 +845,6 @@ nothing else. It is designed for assembling a minimal system.
Summary: All iconv converter modules for %{name}. Summary: All iconv converter modules for %{name}.
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
%ifarch x86_64
# Automatically install the 32-bit variant if the 64-bit variant has
# been installed. This covers the case when glibc.i686 is installed
# before glibc-gconv-extra.x86_64. (See above for the other ordering.)
Recommends: (glibc-gconv-extra(x86-32) if glibc(x86-32))
%endif
%description gconv-extra %description gconv-extra
This package contains all iconv converter modules built in %{name}. This package contains all iconv converter modules built in %{name}.
@ -2195,6 +2182,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Tue Jun 22 2021 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.33.9000-24
- Strengthen dependency on glibc-gconv-extra.
* Fri Jun 18 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-23 * Fri Jun 18 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-23
- Make glibc-all-langpacks require glibc-gconv-extra in buildroots (#1973663) - Make glibc-all-langpacks require glibc-gconv-extra in buildroots (#1973663)