Accepting request 289561 from home:pluskalm:branches:devel:libraries:c_c++

- Cleanup spec file with spec-cleaner
- Update to 1.10.1

OBS-URL: https://build.opensuse.org/request/show/289561
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=13
This commit is contained in:
Marcus Meissner 2015-03-07 08:11:24 +00:00 committed by Git OBS Bridge
parent 178adb4f5b
commit 0a9969f414
4 changed files with 68 additions and 28 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b765f72507cf1cc98b398e0ec85b8f30e640bf1cd0a886c286d0b70d648d7be3
size 3765051

3
hwloc-1.10.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35ce13a9a0737d2de1c6facb5c3c0438f7c83b45d6ce652e05ba000f6f2e514a
size 3771665

View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
Thu Mar 5 15:32:07 UTC 2015 - mpluskal@suse.com
- Cleanup spec file with spec-cleaner
- Update to 1.10.1
* Actually remove disallowed NUMA nodes from nodesets when the
whole-system flag isn't enabled.
* Fix the gathering of PCI domains. Thanks to James Custer for
reporting the issue and providing a patch.
* Fix the merging of identical parent and child in presence of
Misc objects. Thanks to Dave Love for reporting the issue.
* Fix some misordering of children when merging with
ignore_keep_structure() in partially allowed topologies.
* Fix an overzealous assertion in the debug code when running
on a single-PU host with I/O. Thanks to Thomas Van Doren for
reporting the issue.
* Don't forget to setup NUMA node object nodesets in x86 backend
(for BSDs) and OSF/Tru64 backend.
* Fix cpuid-x86 build error with gcc -O3 on x86-32. Thanks to
Thomas Van Doren for reporting the issue.
* Fix support for future very large caches in the x86 backend.
* Fix vendor/device names for SR-IOV PCI devices on Linux.
* Fix an unlikely crash in case of buggy hierarchical distance matrix.
* Fix PU os_index on some AIX releases. Thanks to Hendryk
Bockelmann and Erik Schnetter for helping debugging.
* Fix hwloc_bitmap_isincluded() in case of infinite sets.
* Change hwloc-ls.desktop into a lstopo.desktop and only install
it if lstopo is built with Cairo/X11 support. It cannot work
with a non-graphical lstopo or hwloc-ls.
* Add support for the renaming of Socket into Package in
future releases.
* Add support for the replacement of HWLOC_OBJ_NODE with
HWLOC_OBJ_NUMANODE in future releases.
* Clarify the documentation of distance matrices in hwloc.h and
in the manpage of the hwloc-distances. Thanks to Dave Love for
the suggestion.
* Improve some error messages by displaying more information
about the hwloc library in use.
* Document how to deal with the ABI break when upgrading to
the upcoming 2.0 See "How do I handle ABI breaks and API
upgrades ?" in the FAQ.
-------------------------------------------------------------------
Tue Dec 30 10:34:40 UTC 2014 - mardnh@gmx.de

View File

@ -1,7 +1,7 @@
#
# spec file for package hwloc
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,21 +19,26 @@
%global lname libhwloc5
%define sversion 1.10
Name: hwloc
Version: 1.10.0
Release: 2%{?dist}
Version: 1.10.1
Release: 0
Summary: Portable Hardware Locality
License: BSD-3-Clause
Group: Productivity/Clustering/Computing
Url: http://www.open-mpi.org/projects/hwloc/
Source0: http://www.open-mpi.org/software/hwloc/v%{sversion}/downloads/%{name}-%{version}.tar.bz2
Requires: %{lname} = %{version}-%{release}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libtool
#BuildRequires: libXNVCtrl-devel
BuildRequires: ncurses-devel
BuildRequires: transfig
BuildRequires: update-desktop-files
BuildRequires: w3m
Requires: %{lname} = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} <= 1220 && !0%{?suse_version}
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(libxml-2.0)
@ -47,37 +52,31 @@ BuildRequires: xorg-x11-libICE-devel
BuildRequires: xorg-x11-libSM-devel
BuildRequires: xorg-x11-libX11-devel
%endif
#BuildRequires: libXNVCtrl-devel
BuildRequires: ncurses-devel
BuildRequires: update-desktop-files
#BuildRequires: texlive-latex
%if 0%{?suse_version} <= 1220
BuildRequires: texlive-bin-latex
%else
BuildRequires: texlive-makeindex-bin
%endif
BuildRequires: transfig
BuildRequires: w3m
# % ifnarch s390 s390x
# BuildRequires: libibverbs-devel
# % endif
%ifnarch s390 s390x i586 %{arm}
%ifnarch s390 s390x i586 %arm
BuildRequires: libnuma-devel
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The Portable Hardware Locality (hwloc) software package provides
a portable abstraction (across OS, versions, architectures, ...)
of the hierarchical topology of modern architectures, including
The Portable Hardware Locality (hwloc) software package provides
a portable abstraction (across OS, versions, architectures, ...)
of the hierarchical topology of modern architectures, including
NUMA memory nodes, shared caches, processor sockets, processor cores
and processing units (logical processors or "threads"). It also gathers
various system attributes such as cache and memory information. It primarily
aims at helping applications with gathering information about modern
computing hardware so as to exploit it accordingly and efficiently.
hwloc may display the topology in multiple convenient formats.
It also offers a powerful programming interface (C API) to gather information
hwloc may display the topology in multiple convenient formats.
It also offers a powerful programming interface (C API) to gather information
about the hardware, bind processes, and much more.
%package lstopo
@ -87,7 +86,6 @@ Group: Productivity/Clustering/Computing
%description lstopo
Lstopo shows the topology of the system in various formats.
%package devel
Summary: Headers and shared development libraries for hwloc
Group: Development/Libraries/C and C++
@ -132,18 +130,18 @@ sed -i "s;(LN_S) lstopo-no-graphics;(LN_S) lstopo;g" utils/lstopo/Makefile.in
%configure
##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} V=1
make %{?_smp_mflags} V=1
%install
%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
%suse_update_desktop_file -r hwloc-ls System Monitor
make install DESTDIR=%{buildroot} INSTALL="install -p"
%suse_update_desktop_file -r lstopo System Monitor
#Fix wrong permition on file hwloc-assembler-remote => I have reported this to upstream already
%{__chmod} 0755 %{buildroot}%{_bindir}/hwloc-assembler-remote
chmod 0755 %{buildroot}%{_bindir}/hwloc-assembler-remote
# We don't ship .la files.
%{__rm} -rf %{buildroot}%{_libdir}/libhwloc.la
rm -rf %{buildroot}%{_libdir}/libhwloc.la
# documentation will be handled by % doc macro
%{__rm} -rf %{buildroot}%{_datadir}/doc/
rm -rf %{buildroot}%{_datadir}/doc/
%fdupes -s %{buildroot}/%{_mandir}/man1
%fdupes -s %{buildroot}/%{_mandir}/man3
%fdupes -s %{buildroot}/%{_mandir}/man7
@ -152,7 +150,7 @@ sed -i "s;(LN_S) lstopo-no-graphics;(LN_S) lstopo;g" utils/lstopo/Makefile.in
%check
#XXX: this is weird, but make check got broken by removing doxygen-doc/man above
# the only one fix is to install documentation by hand, or to ignore check error
%{__make} check || :
make %{?_smp_mflags} check || :
%post -n %{lname} -p /sbin/ldconfig