diff --git a/.gitignore b/.gitignore index 79d1ea1..52112f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ hwloc-1.0.2.tar.bz2 /hwloc-1.1.tar.bz2 +/hwloc-1.2.tar.bz2 diff --git a/hwloc.spec b/hwloc.spec index 679e74b..b2524dc 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,21 +1,13 @@ Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Name: hwloc -Version: 1.1 -Release: 0.2%{?dist} +Version: 1.2 +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.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 +Source0: http://www.open-mpi.org/software/hwloc/v1.2/downloads/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libX11-devel libxml2-devel cairo-devel +BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel %ifnarch s390 s390x BuildRequires: numactl-devel %endif @@ -44,10 +36,6 @@ 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 @@ -77,11 +65,6 @@ Headers and shared object symbolic links for the hwloc. # We don't ship .la files. %{__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} %{__cp} -p doc/hwloc-hello.c %{buildroot}%{_defaultdocdir}/%{name}-%{version} @@ -121,6 +104,9 @@ Headers and shared object symbolic links for the hwloc. %changelog +* Mon Jun 27 2011 Jirka Hladky - 1.2-0 +- 1.2 release + * Wed Feb 09 2011 Fedora Release Engineering - 1.1-0.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 31841ed..b11cb0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02dd066f2a5662c7bdfbb7c99bf46d45 hwloc-1.1.tar.bz2 +ba474a912f3f21ced1d28ea4eab5290c hwloc-1.2.tar.bz2