Version 1.1
This commit is contained in:
parent
396f609422
commit
12c6fed92d
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
hwloc-1.0.2.tar.bz2
|
||||
/hwloc-1.1.tar.bz2
|
||||
|
149458
2967_lstopo.patch
Normal file
149458
2967_lstopo.patch
Normal file
File diff suppressed because one or more lines are too long
37
hwloc.spec
37
hwloc.spec
@ -1,13 +1,21 @@
|
||||
Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
|
||||
Name: hwloc
|
||||
Version: 1.0.2
|
||||
Release: 1%{?dist}
|
||||
Version: 1.1
|
||||
Release: 0%{?dist}
|
||||
License: BSD
|
||||
Group: Applications/System
|
||||
URL: http://www.open-mpi.org/projects/hwloc/
|
||||
Source0: http://www.open-mpi.org/software/hwloc/v1.0/downloads/%{name}-%{version}.tar.bz2
|
||||
Source0: http://www.open-mpi.org/software/hwloc/v1.1/downloads/%{name}-%{version}.tar.bz2
|
||||
Patch0: 2967_lstopo.patch
|
||||
# Patch to the 1.1 fix 2967 http://www.open-mpi.org/software/hwloc/nightly/v1.1/hwloc-1.1rc6r2967.tar.bz2
|
||||
# Fix hwloc_bitmap_to_ulong right after allocating the bitmap.
|
||||
# Fix the minimum width of NUMA nodes, caches and the legend in the graphical lstopo output.
|
||||
# Cleanup error management in hwloc-gather-topology.sh.
|
||||
# Add a manpage and usage for hwloc-gather-topology.sh on Linux.
|
||||
#
|
||||
# Rename hwloc-gather-topology.sh to hwloc-gather-topology to be consistent with the upcoming version 1.2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: libX11-devel,libxml2-devel,cairo-devel
|
||||
BuildRequires: libX11-devel,libxml2-devel,cairo-devel,numactl-devel
|
||||
|
||||
%description
|
||||
The Portable Hardware Locality (hwloc) software package provides
|
||||
@ -27,13 +35,17 @@ about the hardware, bind processes, and much more.
|
||||
Summary: Headers and shared development libraries for hwloc
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: libX11-devel,libxml2-devel,cairo-devel
|
||||
BuildRequires: libX11-devel,libxml2-devel,cairo-devel, numactl-devel
|
||||
|
||||
%description devel
|
||||
Headers and shared object symbolic links for the hwloc.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# Apply patches:
|
||||
#
|
||||
%patch0 -p1
|
||||
|
||||
|
||||
%build
|
||||
# There are two options how to get rid of RPATH
|
||||
@ -61,7 +73,12 @@ Headers and shared object symbolic links for the hwloc.
|
||||
%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
|
||||
|
||||
# We don't ship .la files.
|
||||
%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/libhwloc.la
|
||||
%{__rm} -rf %{buildroot}%{_libdir}/libhwloc.la
|
||||
|
||||
# Rename hwloc-gather-topology.sh to hwloc-gather-topology
|
||||
%{__mv} %{buildroot}%{_bindir}/hwloc-gather-topology.sh %{buildroot}%{_bindir}/hwloc-gather-topology
|
||||
%{__mv} %{buildroot}%{_mandir}/man1/hwloc-gather-topology.sh.1 %{buildroot}%{_mandir}/man1/hwloc-gather-topology.1
|
||||
%{__sed} -i -e's/hwloc-gather-topology.sh/hwloc-gather-topology/ig' %{buildroot}%{_mandir}/man1/hwloc-gather-topology.1
|
||||
|
||||
%{__mv} %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
|
||||
%{__cp} -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}-%{version}
|
||||
@ -102,6 +119,14 @@ Headers and shared object symbolic links for the hwloc.
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jan 1 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.1-0
|
||||
- 1.1 rel# Patch to the 1.1 fix 2967 http://www.open-mpi.org/software/hwloc/nightly/v1.1/hwloc-1.1rc6r2967.tar.bz2
|
||||
- Fix hwloc_bitmap_to_ulong right after allocating the bitmap.
|
||||
- Fix the minimum width of NUMA nodes, caches and the legend in the graphical lstopo output.
|
||||
- Cleanup error management in hwloc-gather-topology.sh.
|
||||
- Add a manpage and usage for hwloc-gather-topology.sh on Linux.
|
||||
- Rename hwloc-gather-topology.sh to hwloc-gather-topology to be consistent with the upcoming version 1.2ease
|
||||
|
||||
* Mon Jul 19 2010 Jirka Hladky <jhladky@redhat.com> - 1.0.2-1
|
||||
- 1.0.2 release
|
||||
- added "check" section to the RPM SPEC file
|
||||
|
Loading…
Reference in New Issue
Block a user