Compare commits

...

No commits in common. 'c9' and 'c10-beta' have entirely different histories.
c9 ... c10-beta

2
.gitignore vendored

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

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

@ -1,10 +1,20 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 2;
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 Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
Name: hwloc Name: hwloc
Version: 2.4.1 Version: 2.11.1
Release: 5%{?dist} Release: %autorelease
License: BSD License: BSD-2-Clause
URL: http://www.open-mpi.org/projects/hwloc/ URL: http://www.open-mpi.org/projects/hwloc/
Source0: http://www.open-mpi.org/software/hwloc/v2.4/downloads/%{name}-%{version}.tar.bz2 Source0: https://download.open-mpi.org/release/hwloc/v2.11/hwloc-%{version}.tar.bz2
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: gcc BuildRequires: gcc
@ -13,17 +23,14 @@ BuildRequires: gcc-c++
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: libpciaccess-devel BuildRequires: libpciaccess-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: libxml2-devel BuildRequires: lynx
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: transfig doxygen lynx BuildRequireS: opencl-headers
BuildRequires: texlive-latex texlive-makeindex BuildRequireS: ocl-icd-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
%ifnarch s390 %{arm}
BuildRequires: numactl-devel BuildRequires: numactl-devel
%endif
%ifnarch %{arm}
BuildRequires: rdma-core-devel BuildRequires: rdma-core-devel
%endif BuildRequires: systemd-devel
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%{?systemd_requires} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
@ -67,31 +74,18 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description gui %description gui
GUI-based tool for displaying system topology information. 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 %prep
%autosetup -p1 %autosetup -p1
%build %build
# The ./configure script will support --runstatedir= when generated with %configure --disable-silent-rules --runstatedir=/run
# autoconf 2.70. Until then, tell it about /run using the export:
export runstatedir=/run
%configure --enable-plugins --disable-silent-rules
# Remove rpaths # Remove rpaths
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool 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 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} %make_build
%install %install
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" %make_install
# We don't ship .la files. # We don't ship .la files.
find %{buildroot} -name '*.la' -exec rm -f {} ';' find %{buildroot} -name '*.la' -exec rm -f {} ';'
@ -130,8 +124,6 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
%systemd_postun_with_restart hwloc-dump-hwdata.service %systemd_postun_with_restart hwloc-dump-hwdata.service
%endif %endif
%ldconfig_scriptlets libs
%files %files
%{_datadir}/bash-completion/completions/* %{_datadir}/bash-completion/completions/*
%{_bindir}/%{name}* %{_bindir}/%{name}*
@ -169,17 +161,67 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
%{_mandir}/man1/lstopo.1* %{_mandir}/man1/lstopo.1*
%{_datadir}/applications/lstopo.desktop %{_datadir}/applications/lstopo.desktop
%files plugins
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/hwloc*
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.1-5 ## START: Generated by rpmautospec
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags * Wed Aug 21 2024 Jakub Čajka <jcajka@redhat.com> - 2.11.1-2
Related: rhbz#1991688 - 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
- Updated to version 2.9.3
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.1-4 * Sat Jul 29 2023 Prarit Bhargava <prarit@redhat.com> - 2.9.0-8
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - 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
- Update to 2.5.0
* Thu Mar 18 2021 Dan Horák <dan[at]danny.cz> - 2.4.1-3 * Thu Mar 18 2021 Dan Horák <dan[at]danny.cz> - 2.4.1-3
- use lynx instead of w3m to reduce deps - use lynx instead of w3m to reduce deps
@ -425,3 +467,5 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
* Fri Jun 18 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.1-17 * Fri Jun 18 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.1-17
- Initial build - Initial build
## END: Generated by rpmautospec

Loading…
Cancel
Save