Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/hwloc.git#391c1c22ee4988211a8eeeb6705d701b509e3267

hwloc.spec

@@ -1,7 +1,7 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
 Version:   2.2.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 URL:       http://www.open-mpi.org/projects/hwloc/
 Source0:   http://www.open-mpi.org/software/hwloc/v2.2/downloads/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@ BuildRequires: rdma-core-devel
 %{?systemd_requires}
 BuildRequires: systemd
 %endif
+BuildRequires: make
 
 %description
 The Portable Hardware Locality (hwloc) software package provides 
@@ -174,6 +175,9 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 %{_libdir}/%{name}/hwloc*
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Aug 03 2020 Orion Poplawski <orion@nwra.com> - 2.2.0-1
 - Update to 2.2.0