diff --git a/hwloc.spec b/hwloc.spec index 25d73f3..4b8a3ed 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,7 +1,7 @@ Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Name: hwloc Version: 1.1 -Release: 0%{?dist} +Release: 0.1%{?dist} License: BSD Group: Applications/System URL: http://www.open-mpi.org/projects/hwloc/ @@ -15,7 +15,10 @@ Patch0: 2967_lstopo.patch # # 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,numactl-devel +BuildRequires: libX11-devel libxml2-devel cairo-devel +%ifnarch s390 s390x +BuildRequires: numactl-devel +%endif %description The Portable Hardware Locality (hwloc) software package provides @@ -35,7 +38,6 @@ 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, numactl-devel %description devel Headers and shared object symbolic links for the hwloc. @@ -119,6 +121,9 @@ Headers and shared object symbolic links for the hwloc. %changelog +* Mon Jan 3 2011 Dan HorĂ¡k - 1.1-0.1 +- fix build on s390(x) where numactl is missing + * Sat Jan 1 2011 Jirka Hladky - 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.