From 92e76d4619f9e34e32f31052034cb630220cf731 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 6 Oct 2021 10:17:30 -0400
Subject: [PATCH] import hwloc-2.2.0-3.el8

---
 .gitignore       |  1 +
 .hwloc.metadata  |  1 +
 SPECS/hwloc.spec | 48 +++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 080fbc1..a97325e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+SOURCES/hwloc-1.11.9.tar.bz2
 SOURCES/hwloc-2.2.0.tar.bz2
diff --git a/.hwloc.metadata b/.hwloc.metadata
index 75159e1..65d3b20 100644
--- a/.hwloc.metadata
+++ b/.hwloc.metadata
@@ -1 +1,2 @@
+f403351c2ab08e4a1bef24f466a6e992feb8b0b8 SOURCES/hwloc-1.11.9.tar.bz2
 1b87ff3820b28e718dfdca626a1d27521ea613f6 SOURCES/hwloc-2.2.0.tar.bz2
diff --git a/SPECS/hwloc.spec b/SPECS/hwloc.spec
index 758180f..d51c29c 100644
--- a/SPECS/hwloc.spec
+++ b/SPECS/hwloc.spec
@@ -1,10 +1,12 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
 Version:   2.2.0
-Release:   1%{?dist}
+Release:   3%{?dist}
 License:   BSD
 URL:       http://www.open-mpi.org/projects/hwloc/
 Source0:   http://www.open-mpi.org/software/hwloc/v2.0/downloads/%{name}-%{version}.tar.bz2
+Source1:   http://www.open-mpi.org/software/hwloc/v1.11/downloads/%{name}-1.11.9.tar.bz2
+
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: gcc
@@ -78,10 +80,31 @@ Requires:  %{name}-plugins%{?_isa} = %{version}-%{release}
   - GL support
   - libxml support
 
-%prep
-%autosetup -p1
+%package -n compat-hwloc1
+Summary:   Compat package for hwloc-1.11.9
 
+%description -n compat-hwloc1
+ This package contains a compat library for hwloc-1.11.9.
+
+%prep
+%setup -q hwloc_src -b 1
 %build
+
+# BUILD THE PACKAGE
+
+# The ./configure script will support --runstatedir= when generated with
+# autoconf 2.70. Until then, tell it about /run using the export:
+export runstatedir=/run
+%configure --enable-plugins --disable-silent-rules
+# Remove rpaths
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
+
+
+# BUILD THE COMPAT LIBRARY
+
+cd ../%{name}-1.11.9
 # The ./configure script will support --runstatedir= when generated with
 # autoconf 2.70. Until then, tell it about /run using the export:
 export runstatedir=/run
@@ -92,6 +115,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
+
+# INSTALL THE PACKAGE
+
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 # We don't ship .la files.
@@ -117,8 +143,11 @@ mv %{buildroot}%{_datadir}/%{name}/hwloc-dump-hwdata.service %{buildroot}%{_unit
 rm %{buildroot}%{_datadir}/%{name}/hwloc-dump-hwdata.service
 %endif
 
-%check
-LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
+# INSTALL THE COMPAT LIBRARY
+
+cd ../%{name}-1.11.9
+mkdir -p %{buildroot}%{_libdir}
+cp ./src/.libs/libhwloc.so.5 %{buildroot}%{_libdir}/
 
 %ifarch %{ix86} x86_64
 %post
@@ -174,7 +203,16 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/hwloc*
 
+%files -n compat-hwloc1
+%{_libdir}/libhwloc*so.5*
+
 %changelog
+* Wed Jul  7 2021 Prarit Bhargava <prarit@redhat.com> - 2.2.0-3
+- Add compat-hwloc1 subpackage [1979150]
+
+* Mon May 17 2021 Prarit Bhargava <prarit@redhat.com> - 2.2.0-2
+- Add support for node 0 offline
+
 * Mon Oct 12 2020 Prarit Bhargava <prarit@redhat.com> - 2.2.0-1
 - Rebuild for 8.4.0