From 19ff9659091abea889fdfe28aea25e8fc12226bf Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 21 2021 07:15:52 +0000 Subject: import gcc-toolset-10-elfutils-0.182-6.el8_4 --- diff --git a/SPECS/elfutils.spec b/SPECS/elfutils.spec index 80c1520..8940d4c 100644 --- a/SPECS/elfutils.spec +++ b/SPECS/elfutils.spec @@ -5,7 +5,7 @@ Name: %{?scl_prefix}elfutils Version: 0.182 -%global baserelease 5 +%global baserelease 6 Release: %{baserelease}%{?dist} URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ @@ -82,8 +82,13 @@ BuildRequires: autoconf automake # 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 @@ -437,6 +442,9 @@ fi %changelog +* Fri Sep 3 2021 Mark Wielaard - 0.182-6 +- Also use __requires_exclude_from for libdw.pc + * Thu Jul 29 2021 Mark Wielaard - 0.182-5 - Use __provides_exclude_from instead of filter_from_provides