From 1634d3805b738756351975c3c34c8cfffee8b93e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 18 May 2021 02:36:05 -0400 Subject: [PATCH] import hwloc-2.2.0-1.el8 --- .gitignore | 2 +- .hwloc.metadata | 2 +- SPECS/hwloc.spec | 64 +++++++++++++++++++++++++++++++++--------------- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 15436e8..080fbc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/hwloc-1.11.9.tar.bz2 +SOURCES/hwloc-2.2.0.tar.bz2 diff --git a/.hwloc.metadata b/.hwloc.metadata index 1e342d7..75159e1 100644 --- a/.hwloc.metadata +++ b/.hwloc.metadata @@ -1 +1 @@ -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 98cb9ac..758180f 100644 --- a/SPECS/hwloc.spec +++ b/SPECS/hwloc.spec @@ -1,10 +1,10 @@ Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Name: hwloc -Version: 1.11.9 -Release: 3%{?dist} +Version: 2.2.0 +Release: 1%{?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 Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: gcc @@ -17,7 +17,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} @@ -30,7 +30,6 @@ BuildRequires: rdma-core-devel %{?systemd_requires} BuildRequires: systemd %endif -BuildRequires: libtool %description The Portable Hardware Locality (hwloc) software package provides @@ -119,7 +118,7 @@ rm %{buildroot}%{_datadir}/%{name}/hwloc-dump-hwdata.service %endif %check -LD_LIBRARY_PATH=$PWD/src/.libs make check +LD_LIBRARY_PATH=$PWD/hwloc/.libs make check %ifarch %{ix86} x86_64 %post @@ -139,6 +138,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 @@ -152,15 +152,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 @@ -172,12 +175,33 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check %{_libdir}/%{name}/hwloc* %changelog -* Tue Mar 12 2019 Prarit Bhargava - 1.11.9-3 -- add libtool requirement [1657366] +* Mon Oct 12 2020 Prarit Bhargava - 2.2.0-1 +- Rebuild for 8.4.0 -* Wed Aug 15 2018 Troy Dawson - 1.11.9-2 -- Use lynx instead of w3m -- Resolves: bug#1563245 +* Tue Jun 2 2020 Prarit Bhargava - 2.2.0-0 +- Upgrade RHEL to 2.2.0 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Dec 09 2019 Orion Poplawski - 2.0.4-2 +- Drop BR/R on rdma-core-devel on arm (bz#1780813) + +* Sat Aug 24 2019 Zbigniew Jędrzejewski-Szmek - 2.0.4-1 +- Update to latest version (#1663624) + +* Thu Jul 25 2019 Fedora Release Engineering - 1.11.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.11.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 30 2019 Michal Schmidt - 1.11.12-1 +- Upstream release 1.11.12. +- BR rdma-core-devel even on arm. + +* Fri Jul 13 2018 Fedora Release Engineering - 1.11.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Mon Mar 05 2018 Michal Schmidt - 1.11.9-1 - Update to 1.11.9. @@ -326,14 +350,14 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check - Update build for ARM support * Sat Oct 15 2011 Jirka Hladky - 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 - 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 - 1.2.2-0 - 1.2.2 release