rpm/hwloc
SHA256
1
0
Fork 0
forked from pool/hwloc
Code Pull Requests Activity

Accepting request 455568 from devel:libraries:c_c++

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/455568
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hwloc?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2017-02-13 23:43:23 +00:00 committed by Git OBS Bridge
commit f682fc9d99
5 changed files with 120 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_service Normal file
View File

@ -0,0 +1,5 @@
<services>
<service name="download_files" mode="localonly">
<param name="enforceupstream">yes</param>
</service>
</services>

3
hwloc-1.11.2.tar.bz2
View File

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

3
hwloc-1.11.5.tar.gz Normal file
View File

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

51
hwloc.changes
View File

@ -1,3 +1,54 @@
-------------------------------------------------------------------
Wed Feb 8 12:46:42 UTC 2017 - jengelh@inai.de
- fix grammar errors
-------------------------------------------------------------------
Fri Jan 27 13:14:01 UTC 2017 - Thomas.Blume@suse.com
- use correct upstream source version
-------------------------------------------------------------------
Tue Jan 24 15:10:18 UTC 2017 - Thomas.Blume@suse.com
- use version_prefix in specfile and download_files service to get sources
-------------------------------------------------------------------
Mon Jan 23 14:37:16 UTC 2017 - tchvatal@suse.com
- Set noarch on the subpackages that are arch independent
- Run configure with enabling verbose mode and disable needless knobs
- Set version in the package fully (not 1.11 but 1.11.5+git...)
- Rename files to name of the package, if it needs to be renamed the folder
needs to keep the other name too
- Do not mess with provides/obsoletes about the hwloc-2.0 it won't work
with libsolv anyway without user interaction
* Bump the user version to 2.0.0.1.11.5+git... to allow 'fake' update
for user in order to work with fate#321929c#5
-------------------------------------------------------------------
Tue Jan 17 12:34:11 UTC 2017 - Thomas.Blume@suse.com
- switch to version 1.11.5 since 2.0 is a development version with
no .so-version set fate#321929 comment#5)
-------------------------------------------------------------------
Mon Aug 29 13:28:27 UTC 2016 - Thomas.Blume@suse.com
- fix missing manpage bug (bsc#995407)
- remove dependency to selinux-policy, selinux is not essential
for hwloc (bsc#976559 comment#4)
-------------------------------------------------------------------
Fri Apr 22 08:28:22 UTC 2016 - Thomas.Blume@suse.com
- add dependency to selinux-policy (bsc#976559)
-------------------------------------------------------------------
Fri Mar 11 05:39:24 UTC 2016 - thomas.blume@suse.com
- Update to 2.0 to support memory side cache (fate#319511)
-------------------------------------------------------------------
Sat Dec 26 17:24:37 UTC 2015 - mpluskal@suse.com

143
hwloc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package hwloc
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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
@ -17,59 +17,48 @@
%global lname libhwloc5
%define sversion 1.11
%if ! 0%{?is_opensuse}
%define version_prefix 2.0.0.
%endif
%define mainversion 1.11.5
Name: hwloc
Version: 1.11.2
Version: %{?version_prefix}%{?mainversion}
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
#Source0: %{name}-%{version}.tar.xz
Source0: https://github.com/open-mpi/hwloc/archive/%{name}-%{mainversion}.tar.gz
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libtool
#BuildRequires: libXNVCtrl-devel
BuildRequires: ncurses-devel
BuildRequires: transfig
BuildRequires: perl
BuildRequires: pkgconfig
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)
BuildRequires: pkgconfig(pciaccess)
BuildRequires: pkgconfig(x11)
%else
BuildRequires: cairo-devel
BuildRequires: libxml2-devel
BuildRequires: ncurses-devel
BuildRequires: xorg-x11-libICE-devel
BuildRequires: xorg-x11-libSM-devel
BuildRequires: xorg-x11-libX11-devel
%endif
#BuildRequires: texlive-latex
%if 0%{?suse_version} <= 1220
BuildRequires: texlive-bin-latex
%else
BuildRequires: texlive-makeindex-bin
%endif
# % ifnarch s390 s390x
# BuildRequires: libibverbs-devel
# % endif
%ifnarch s390 s390x i586 %arm
Requires: %{lname} = %{version}-%{release}
Requires: perl-JSON
Requires: perl-base >= 5.18.2
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%ifnarch s390 s390x i586 aarch64 %{arm}
BuildRequires: libnuma-devel
%endif
%description
The Portable Hardware Locality (hwloc) software package provides
a portable abstraction (across OS, versions, architectures, ...)
an abstraction (across OS, versions, architectures, ...)
of the hierarchical topology of modern architectures, including
NUMA memory nodes, shared caches, processor sockets, processor cores
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
@ -79,73 +68,62 @@ 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
Summary: Shows the topology in various formats
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++
Requires: %{lname} = %{version}
Provides: lib%{name}-devel = %{version}-%{release}
Obsoletes: lib%{name}-devel <= 1.4.1
Provides: libhwloc-devel = %{version}
Obsoletes: libhwloc-devel < %{version}
Obsoletes: libhwloc-devel = 0.0.0
%description devel
Headers and shared object symbolic links for the hwloc.
This package contains the headers and shared object symbolic links
for the hwloc.
%package -n %{lname}
Summary: Run time libraries for the hwloc
Summary: Runtime libraries for hwloc
Group: System/Libraries
Requires: %{name}-data
%description -n %{lname}
Run time libraries for the %{name}.
Package contains run time libraries for the hwloc.
%package data
Summary: Run time data for hwloc
Group: Development/Libraries/C and C++
Summary: Runtime data for hwloc
Group: System/Libraries
BuildArch: noarch
%description data
Run time data for the hwloc.
This package contains the runtime data for hwloc.
%package doc
Summary: Documentation for hwloc
Group: Documentation/Other
BuildArch: noarch
%description doc
Package contains documentation for %{name}.
This package contains the documentation for hwlock.
%prep
%setup -q
%setup -q -n %{name}-%{name}-%{mainversion}
%build
%if 0%{?sles_version}
sed -i 's/1.11 dist-bzip2 subdir-objects foreign tar-ustar parallel-tests -Wall -Werror/1.10 dist-bzip2 subdir-objects foreign tar-ustar -Wall -Werror/g' configure.ac
%endif
autoreconf --force --install
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
autoreconf -fvi
%configure \
--disable-silent-rules
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot} INSTALL="install -p"
%make_install
%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
# We don't ship .la files.
rm -rf %{buildroot}%{_libdir}/libhwloc.la
# documentation will be handled by % doc macro
rm -rf %{buildroot}%{_datadir}/doc/
%fdupes -s %{buildroot}/%{_mandir}/man1
%fdupes -s %{buildroot}/%{_mandir}/man3
%fdupes -s %{buildroot}/%{_mandir}/man7
%fdupes -s doc/doxygen-doc
%check
#XXX: this is weird, but make check got broken by removing doxygen-doc/man above
@ -153,34 +131,36 @@ rm -rf %{buildroot}%{_datadir}/doc/
make %{?_smp_mflags} check || :
%post -n %{lname} -p /sbin/ldconfig
%postun -n %{lname} -p /sbin/ldconfig
%post
%desktop_database_post
%postun
%desktop_database_postun
%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING NEWS README VERSION
%attr(0755,root,root) %{_bindir}/%{name}*
# This binary is built only for intel architectures
%ifarch %ix86 x86_64
%ifarch %{ix86} x86_64
%attr(0755,root,root) %{_sbindir}/hwloc-dump-hwdata
%endif
%doc %{_mandir}/man1/%{name}*
%files lstopo
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/lstopo*
%{_mandir}/man1/hwloc*
%{_mandir}/man1/lstopo*
%{_bindir}/hwloc*
%{_bindir}/lstopo*
%dir %{_datadir}/hwloc
%{_datadir}/applications/*.desktop
%doc %{_mandir}/man1/lstopo.1*
%doc %{_mandir}/man1/lstopo-no-graphics.1.*
%{_datadir}/hwloc/hwloc-dump-hwdata.service
%files devel
%defattr(-, root, root, -)
%doc %{_mandir}/man3/*
%doc %{_mandir}/man7/%{name}*
%{_includedir}/%{name}
%{_includedir}/%{name}.h
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%{_mandir}/man7/hwloc*
%{_includedir}/hwloc
%{_includedir}/hwloc.h
%{_libdir}/libhwloc.so
%{_libdir}/pkgconfig/hwloc.pc
%files -n %{lname}
%defattr(-, root, root, -)
@ -188,13 +168,12 @@ make %{?_smp_mflags} check || :
%files data
%defattr(-, root, root, -)
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/%{name}.dtd
%{_datadir}/%{name}/%{name}-valgrind.supp
%dir %{_datadir}/hwloc
%{_datadir}/hwloc/hwloc.dtd
%{_datadir}/hwloc/hwloc-valgrind.supp
%files doc
%defattr(-, root, root, -)
%doc doc/doxygen-doc/html
%doc doc/doxygen-doc/hwloc*.pdf
%doc ./doc/images/*.pdf
%changelog