Accepting request 1087175 from home:tsaupe:branches:devel:libraries:c_c++:hwloc-PED-4156

resync devel repo with latest maintenance update (jsc#PED-4156)

OBS-URL: https://build.opensuse.org/request/show/1087175
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=56
This commit is contained in:
Adam Majer 2023-05-16 14:16:44 +00:00 committed by Git OBS Bridge
parent ab94008e74
commit 43b629de2a
2 changed files with 17 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 9 13:20:12 UTC 2023 - Thomas Blume <thomas.blume@suse.com>
- remove header files for feature we don't ship (jsc#PED-4156)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 26 14:53:18 UTC 2023 - Callum Farmer <gmbr3@opensuse.org> Thu Jan 26 14:53:18 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
@ -52,6 +57,8 @@ Mon Jul 11 07:47:23 UTC 2022 - Dirk Müller <dmueller@suse.com>
* Misc * Misc
+ Add --disable-readme to avoid regenerating the top-level hwloc README + Add --disable-readme to avoid regenerating the top-level hwloc README
file from the documentation. file from the documentation.
* Bugfix
+ Use setenv() instead of putenv() - fixes crash in Slurm (bsc#1210227)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 8 16:42:15 UTC 2022 - Dirk Müller <dmueller@suse.com> Fri Apr 8 16:42:15 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package hwloc # spec file for package hwloc
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%global lname libhwloc15 %global lname libhwloc15
Name: hwloc Name: hwloc
Version: 2.9.0 Version: 2.9.0
@ -122,6 +123,14 @@ install -D -m 644 %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %{buil
%endif %endif
rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service
#remove headers for features we don't ship
rm %{buildroot}%{_includedir}/hwloc/rsmi.h
rm %{buildroot}%{_includedir}/hwloc/nvml.h
rm %{buildroot}%{_includedir}/hwloc/opencl.h
rm %{buildroot}%{_includedir}/hwloc/levelzero.h
rm %{buildroot}%{_includedir}/hwloc/cuda.h
rm %{buildroot}%{_includedir}/hwloc/cudart.h
%fdupes -s %{buildroot}/%{_mandir}/man1 %fdupes -s %{buildroot}/%{_mandir}/man1
%fdupes -s %{buildroot}/%{_mandir}/man7 %fdupes -s %{buildroot}/%{_mandir}/man7