.gitignore

@@ -1 +1,2 @@
-SOURCES/hwloc-2.4.1.tar.bz2
+SOURCES/hwloc-1.11.9.tar.bz2
+SOURCES/hwloc-2.2.0.tar.bz2

.hwloc.metadata

@@ -1 +1,2 @@
-1b65f5c88947d13795da1c7fae9b6ab9a91b1fb1 SOURCES/hwloc-2.4.1.tar.bz2
+f403351c2ab08e4a1bef24f466a6e992feb8b0b8 SOURCES/hwloc-1.11.9.tar.bz2
+1b87ff3820b28e718dfdca626a1d27521ea613f6 SOURCES/hwloc-2.2.0.tar.bz2

SPECS/hwloc.spec

@@ -1,10 +1,12 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   2.4.1
-Release:   5%{?dist}
+Version:   2.2.0
+Release:   3%{?dist}
 License:   BSD
 URL:       http://www.open-mpi.org/projects/hwloc/
-Source0:   http://www.open-mpi.org/software/hwloc/v2.4/downloads/%{name}-%{version}.tar.bz2
+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
@@ -12,10 +14,12 @@ BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: cairo-devel
 BuildRequires: libpciaccess-devel
+BuildRequires: libtool-ltdl-devel
 BuildRequires: libX11-devel
 BuildRequires: libxml2-devel
+BuildRequires: libXNVCtrl-devel
 BuildRequires: ncurses-devel
-BuildRequires: transfig doxygen lynx
+BuildRequires: transfig doxygen
 BuildRequires: texlive-latex texlive-makeindex
 BuildRequires: desktop-file-utils
 %ifnarch s390 %{arm}
@@ -28,7 +32,6 @@ BuildRequires: rdma-core-devel
 %{?systemd_requires}
 BuildRequires: systemd
 %endif
-BuildRequires: make
 
 %description
 The Portable Hardware Locality (hwloc) software package provides 
@@ -77,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
@@ -91,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.
@@ -116,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
@@ -133,12 +163,11 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 %ldconfig_scriptlets libs
 
 %files
-%{_datadir}/bash-completion/completions/*
 %{_bindir}/%{name}*
 %{_bindir}/lstopo-no-graphics
-%{_datadir}/hwloc/hwloc-ps.www/
 %{_mandir}/man1/%{name}*
 %{_mandir}/man1/lstopo-no-graphics*
+/etc/bash_completion.d/hwloc-completion.bash
 %ifarch %{ix86} x86_64
 %{_sbindir}/hwloc-dump-hwdata
 %{_unitdir}/hwloc-dump-hwdata.service
@@ -152,6 +181,7 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 %{_includedir}/%{name}.h
 %{_pkgdocdir}/examples
 %{_libdir}/*.so
+/usr/share/hwloc/hwloc-ps.www/*
 
 %files libs
 %{_mandir}/man7/%{name}*
@@ -173,39 +203,21 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/hwloc*
 
+%files -n compat-hwloc1
+%{_libdir}/libhwloc*so.5*
+
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.1-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Wed Jul  7 2021 Prarit Bhargava <prarit@redhat.com> - 2.2.0-3
+- Add compat-hwloc1 subpackage [1979150]
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.1-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Mon May 17 2021 Prarit Bhargava <prarit@redhat.com> - 2.2.0-2
+- Add support for node 0 offline
 
-* Thu Mar 18 2021 Dan Horák <dan[at]danny.cz> - 2.4.1-3
-- use lynx instead of w3m to reduce deps
+* Mon Oct 12 2020 Prarit Bhargava <prarit@redhat.com> - 2.2.0-1
+- Rebuild for 8.4.0
 
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.4.1-2
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Mon Mar 01 2021 Jirka Hladky <hladky.jiri@gmail.com> - 2.4.1-1
-- Update to 2.4.1
-
-* Wed Feb 24 2021 Prarit Bhargava <prarit@redhat.com> - 2.2.0-3
-- remove libXNVCtrl dependency
-
-* 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
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-5
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Tue Jun 2 2020 Prarit Bhargava <prarit@redhat.com> - 2.2.0-0
+- Upgrade RHEL to 2.2.0
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild