From 9d6b9d2cc2cbafeca86e54f5d7d402753f4150df Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 22 Dec 2021 04:24:44 +0000 Subject: [PATCH] import redhat-rpm-config-127-1.el8 --- SPECS/redhat-rpm-config.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SPECS/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec index 0e427ff..8a56f2e 100644 --- a/SPECS/redhat-rpm-config.spec +++ b/SPECS/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 126 +Version: 127 Release: 1%{?dist} # No version specified. License: GPL+ @@ -113,6 +113,11 @@ Requires: %{_bindir}/grep Requires: %{_bindir}/sed Requires: %{_bindir}/xargs +# iconv modules have been split out of glibc into a separate package (#1971664) +# so let's ensure packages that require them at build time but haven't yet +# added an explicit BuildRequires will continue to work (#2013328) +Requires: glibc-gconv-extra + # -fstack-clash-protection and -fcf-protection require GCC 8. Conflicts: gcc < 8 @@ -205,6 +210,9 @@ install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Dec 13 2021 Michal Domonkos - 127-1 +- Add Requires: glibc-gconv-extras to cover for the split (#2013328) + * Mon Nov 29 2021 Florian Weimer - 126-1 - buildflags.md: Documentation updates (#2005079)