From 84b2c5eb570e886e1b6a7fdbecd565e64ba15956 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 29 2022 15:33:04 +0000 Subject: import gcc-toolset-11-elfutils-0.185-5.el8 --- diff --git a/SPECS/elfutils.spec b/SPECS/elfutils.spec index 5fe181b..5ebae55 100644 --- a/SPECS/elfutils.spec +++ b/SPECS/elfutils.spec @@ -5,7 +5,7 @@ Name: %{?scl_prefix}elfutils Version: 0.185 -%global baserelease 3 +%global baserelease 5 Release: %{baserelease}%{?dist} URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ @@ -84,8 +84,13 @@ BuildRequires: gettext-devel # Remove any pkgconfig provides for SCL devel packages. # These should only be provided by the base packages. +# Also remove the pkgconfig requires for libdw because that +# includes libelf, which should come from the SCL, not the +# base system. The other pkgconfig requires are fine and do +# come from base. %if %{is_scl} %define __provides_exclude_from ^%{_libdir}/pkgconfig/.*.pc$ +%define __requires_exclude_from ^%{_libdir}/pkgconfig/libdw.pc$ %endif # Patches @@ -434,6 +439,12 @@ fi %{_mandir}/man8/debuginfod.8* %changelog +* Thu Sep 30 2021 Mark Wielaard - 0.185-5 +- Rebuilt for #2000942 + +* Fri Sep 3 2021 Mark Wielaard - 0.185-4 +- Also use __requires_exclude_from for libdw.pc + * Thu Jul 29 2021 Mark Wielaard - 0.185-3 - Use __provides_exclude_from instead of filter_from_provides