diff --git a/SPECS/elfutils.spec b/SPECS/elfutils.spec index 2988dc5..5ebae55 100644 --- a/SPECS/elfutils.spec +++ b/SPECS/elfutils.spec @@ -5,7 +5,7 @@ Name: %{?scl_prefix}elfutils Version: 0.185 -%global baserelease 1 +%global baserelease 5 Release: %{baserelease}%{?dist} URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ @@ -78,6 +78,21 @@ BuildRequires: gettext-devel # For DTS we never provide the default yama scope. %global provide_yama_scope 0 +# Are we building for a Software Collection? +%{?scl:%global is_scl 1} +%{!?scl:%global is_scl 0} + +# 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 # DTS specific patches. @@ -424,7 +439,19 @@ fi %{_mandir}/man8/debuginfod.8* %changelog -* Thu May 27 2021 Mark Wielaard - 0.185-1 +* 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 + +* Thu Jun 24 2021 Mark Wielaard - 0.185-2 +- Filter out pkgconfig provides + +* Thu May 27 2021 Mark Wielaard - 0.185-1 - Upgrade to upstream 0.185 * Wed Nov 11 2020 Mark Wielaard - 0.182-3