.gitignore

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

.hwloc.metadata

@@ -1 +1,2 @@
 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:   1.11.9
-Release:   2%{?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/v1.11/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
@@ -17,7 +19,7 @@ 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}
@@ -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/src/.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
@@ -138,6 +167,7 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 %{_bindir}/lstopo-no-graphics
 %{_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
@@ -151,15 +181,18 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 %{_includedir}/%{name}.h
 %{_pkgdocdir}/examples
 %{_libdir}/*.so
+/usr/share/hwloc/hwloc-ps.www/*
 
 %files libs
 %{_mandir}/man7/%{name}*
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/%{name}.dtd
-%{_datadir}/%{name}/%{name}-valgrind.supp
+%{_datadir}/hwloc/hwloc.dtd
+%{_datadir}/hwloc/hwloc-valgrind.supp
+%{_datadir}/hwloc/hwloc2.dtd
+%{_datadir}/hwloc/hwloc2-diff.dtd
 %dir %{_pkgdocdir}/
 %{_pkgdocdir}/*[^c]
-%{_libdir}/libhwloc*so.5*
+%{_libdir}/libhwloc*so.15*
 
 %files gui
 %{_bindir}/lstopo
@@ -170,10 +203,43 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/hwloc*
 
+%files -n compat-hwloc1
+%{_libdir}/libhwloc*so.5*
+
 %changelog
-* Wed Aug 15 2018 Troy Dawson <tdawson@redhat.com> - 1.11.9-2
-- Use lynx instead of w3m
-- Resolves: bug#1563245
+* 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
+
+* 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
+
+* Mon Dec 09 2019 Orion Poplawski <orion@nwra.com> - 2.0.4-2
+- Drop BR/R on rdma-core-devel on arm (bz#1780813)
+
+* Sat Aug 24 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.0.4-1
+- Update to latest version (#1663624)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 30 2019 Michal Schmidt <mschmidt@redhat.com> - 1.11.12-1
+- Upstream release 1.11.12.
+- BR rdma-core-devel even on arm.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Mon Mar 05 2018 Michal Schmidt <mschmidt@redhat.com> - 1.11.9-1
 - Update to 1.11.9.
@@ -322,14 +388,14 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 - Update build for ARM support
 
 * Sat Oct 15 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.3-0
- - 1.3 release
- - added dependency on libibverbs-devel pciutils-devel
- - cannot provide support for cuda (cuda_runtime_api.h). 
- - Nvidia CUDA is free but not open-source therefore not in Fedora.
+- 1.3 release
+- added dependency on libibverbs-devel pciutils-devel
+- cannot provide support for cuda (cuda_runtime_api.h).
+- Nvidia CUDA is free but not open-source therefore not in Fedora.
 
 * Fri Oct 07 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2.2-1
- - moved *.so to the devel package
- - libhwloc*so* in the main package
+- moved *.so to the devel package
+- libhwloc*so* in the main package
 
 * Wed Oct 05 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2.2-0
 - 1.2.2 release