.gitignore

@@ -1 +1 @@
-SOURCES/hwloc-2.11.1.tar.bz2
+SOURCES/hwloc-2.4.1.tar.bz2

.hwloc.metadata

@@ -1 +1 @@
-bbbd433d6c42e80ba1c647c732f3707e5d3b8e4f SOURCES/hwloc-2.11.1.tar.bz2
+1b65f5c88947d13795da1c7fae9b6ab9a91b1fb1 SOURCES/hwloc-2.4.1.tar.bz2

SPECS/hwloc.spec

@@ -1,20 +1,10 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 3;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   2.11.1
+Version:   2.4.1
-Release:   %autorelease
+Release:   5%{?dist}
-License:   BSD-2-Clause
+License:   BSD
 URL:       http://www.open-mpi.org/projects/hwloc/
-Source0:   https://download.open-mpi.org/release/hwloc/v2.11/hwloc-%{version}.tar.bz2
+Source0:   http://www.open-mpi.org/software/hwloc/v2.4/downloads/%{name}-%{version}.tar.bz2
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: gcc
@@ -23,14 +13,17 @@ BuildRequires: gcc-c++
 BuildRequires: cairo-devel
 BuildRequires: libpciaccess-devel
 BuildRequires: libX11-devel
-BuildRequires: lynx
+BuildRequires: libxml2-devel
 BuildRequires: ncurses-devel
-BuildRequireS: opencl-headers
+BuildRequires: transfig doxygen lynx
-BuildRequireS: ocl-icd-devel
+BuildRequires: texlive-latex texlive-makeindex
 BuildRequires: desktop-file-utils
+%ifnarch s390 %{arm}
 BuildRequires: numactl-devel
+%endif
+%ifnarch %{arm}
 BuildRequires: rdma-core-devel
-BuildRequires: systemd-devel
+%endif
 %ifarch %{ix86} x86_64
 %{?systemd_requires}
 BuildRequires: systemd
@@ -74,18 +67,31 @@ Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 %description gui
 GUI-based tool for displaying system topology information.
 
+%package plugins
+Summary:   Plugins for hwloc
+Requires:  %{name}-plugins%{?_isa} = %{version}-%{release}
+
+%description plugins
+ This package contains plugins for hwloc. This includes
+  - PCI support
+  - GL support
+  - libxml support
+
 %prep
 %autosetup -p1
 
 %build
-%configure --disable-silent-rules --runstatedir=/run
+# 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_build
+make %{?_smp_mflags}
 
 %install
-%make_install
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 # We don't ship .la files.
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
@@ -124,6 +130,8 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 %systemd_postun_with_restart hwloc-dump-hwdata.service
 %endif
 
+%ldconfig_scriptlets libs
+
 %files
 %{_datadir}/bash-completion/completions/*
 %{_bindir}/%{name}*
@@ -161,70 +169,17 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 %{_mandir}/man1/lstopo.1*
 %{_datadir}/applications/lstopo.desktop
 
-%changelog
+%files plugins
-## START: Generated by rpmautospec
+%dir %{_libdir}/%{name}
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.11.1-3
+%{_libdir}/%{name}/hwloc*
-- Bump release for October 2024 mass rebuild:
-
-* Wed Aug 21 2024 Jakub Čajka <jcajka@redhat.com> - 2.11.1-2
-- Disable plugins reduce dependencies Resolves: RHEL-55147
-
-* Thu Jul 25 2024 Jakub Čajka <jcajka@redhat.com> - 2.11.1-1
-- Update to latest upstream version Resolves: RHEL-39142 and RHEL-49501
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.10.0-4
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Dec 05 2023 Jirka Hladky <jhladky@redhat.com> - 2.10.0-1
-- Updated to version 2.10.0
 
-* Mon Oct 09 2023 Jirka Hladky <jhladky@redhat.com> - 2.9.3-1
+%changelog
-- Updated to version 2.9.3
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.1-5
-
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-* Sat Jul 29 2023 Prarit Bhargava <prarit@redhat.com> - 2.9.0-8
+  Related: rhbz#1991688
-- hwloc.spec: migrated to SPDX license
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Feb 24 2023 Michal Schmidt <mschmidt@redhat.com> - 2.9.0-6
-- oneapi-level-zero-devel is ExclusiveArch x86_64
-
-* Fri Feb 24 2023 Michal Schmidt <mschmidt@redhat.com> - 2.9.0-5
-- add BRs for optional hwloc functionality
-
-* Fri Feb 24 2023 Michal Schmidt <mschmidt@redhat.com> - 2.9.0-4
-- Drop %%ifnarch conditions about no longer relevant archs
-
-* Fri Feb 24 2023 Michal Schmidt <mschmidt@redhat.com> - 2.9.0-3
-- drop BRs for generating docs
-
-* Fri Feb 24 2023 Michal Schmidt <mschmidt@redhat.com> - 2.9.0-2
-- drop ldconfig_scriptlets
-
-* Fri Feb 24 2023 Michal Schmidt <mschmidt@redhat.com> - 2.9.0-1
-- Update to v2.9.0
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Sun Jul 11 2021 Jirka Hladky <hladky.jiri@gmail.com> - 2.5.0-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.1-4
-- Update to 2.5.0
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Thu Mar 18 2021 Dan Horák <dan[at]danny.cz> - 2.4.1-3
 - use lynx instead of w3m to reduce deps
@@ -470,5 +425,3 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
 
 * Fri Jun 18 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.1-17
 - Initial build
-
-## END: Generated by rpmautospec