SPECS/valgrind.spec

@@ -6,7 +6,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.17.0
-Release: 4%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -67,6 +67,12 @@ URL: http://www.valgrind.org/
   %endif
 %endif
 
+# Remove any pkgconfig provides for SCL devel packages.
+# These should only be provided by the base packages.
+%if %{is_scl}
+%define __provides_exclude_from ^%{_libdir}/pkgconfig/.*.pc$
+%endif
+
 # Generating minisymtabs doesn't really work for the staticly linked
 # tools. Note (below) that we don't strip the vgpreload libraries at all
 # because valgrind might read and need the debuginfo in those (client)
@@ -487,6 +493,12 @@ fi
 %endif
 
 %changelog
+* Thu Jul 29 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-6
+- Use __provides_exclude_from instead of filter_from_provides
+
+* Thu Jun 24 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-5
+- Filter out pkgconfig provides
+
 * Thu Jun  3 2021 Mark Wielaard <mjw@redhat.com> - 3.17.0-4
 - Update to upstream 3.17.0 final.
 - Add valgrind-3.17.0-ppc64-isa-3.1{,tests}.patch