SPECS/elfutils.spec

@@ -5,7 +5,7 @@
 
 Name: %{?scl_prefix}elfutils
 Version: 0.182
-%global baserelease 3
+%global baserelease 6
 Release: %{baserelease}%{?dist}
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
@@ -76,6 +76,21 @@ BuildRequires: autoconf automake
 # 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
 
 Patch1: elfutils-0.182-debuginfod-test-fix.patch
@@ -427,6 +442,15 @@ fi
 
 
 %changelog
+* Fri Sep  3 2021 Mark Wielaard <mjw@redhat.com> - 0.182-6
+- Also use __requires_exclude_from for libdw.pc
+
+* Thu Jul 29 2021 Mark Wielaard <mjw@redhat.com> - 0.182-5
+- Use __provides_exclude_from instead of filter_from_provides
+
+* Thu Jun 29 2021 Mark Wielaard <mjw@redhat.com> - 0.182-4
+- Filter out pkgconfig provides
+
 * Wed Nov 11 2020 Mark Wielaard <mjw@redhat.com> - 0.182-3
 - Add -lzstd to libdw.so linker script.