From 93698e74ff32ae13f9df51dda845fc212b5508c1 Mon Sep 17 00:00:00 2001
From: Jirka Hladky <hladky.jiri@gmail.com>
Date: Tue, 17 Apr 2012 00:56:47 +0200
Subject: [PATCH] Update to 1.4-1

---
 .gitignore |  1 +
 hwloc.spec | 14 ++++++++++----
 sources    |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1cbe16a..5eeca65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ hwloc-1.0.2.tar.bz2
 /hwloc-1.2.2.tar.bz2
 /hwloc-1.3.tar.bz2
 /hwloc-1.4.tar.bz2
+/hwloc-1.4.1.tar.bz2
diff --git a/hwloc.spec b/hwloc.spec
index e225ab2..05c3b93 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,19 +1,20 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   1.4
-Release:   2%{?dist}
+Version:   1.4.1
+Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://www.open-mpi.org/projects/hwloc/
 Source0:   http://www.open-mpi.org/software/hwloc/v1.3/downloads/%{name}-%{version}.tar.bz2
 #Patch0:    hwloc-1.2.1.patch
 
-BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel pciutils-devel transfig doxygen w3m
+BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel libibverbs-devel pciutils-devel transfig doxygen w3m
 %ifnarch s390 s390x
 BuildRequires: libibverbs-devel
 %endif
 %ifnarch s390 s390x %{arm}
 BuildRequires: numactl-devel
+Requires: numactl-libs
 %endif
 
 %description
@@ -76,6 +77,7 @@ Headers and shared object symbolic links for the hwloc.
 %{_mandir}/man1/lstopo*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{name}.dtd
+%{_datadir}/%{name}/%{name}-valgrind.supp
 %dir %{_defaultdocdir}/%{name}-%{version}
 %{_defaultdocdir}/%{name}-%{version}/*[^c]
 %{_libdir}/libhwloc*so.*
@@ -92,6 +94,10 @@ Headers and shared object symbolic links for the hwloc.
 
 
 %changelog
+* Mon Apr 16 2012 Jirka Hladky  <hladky.jiri@gmail.com> - 1.4.1-1
+- Update to version 1.4.1
+- BZ812622 - libnuma was splitted out of numactl package
+
 * Thu Apr 12 2012 Dan Horák <dan[at]danny.cz> - 1.4-2
 - no InfiniBand on s390(x)
 
@@ -105,7 +111,7 @@ Headers and shared object symbolic links for the hwloc.
  - 1.3 release
  - added dependency on libibverbs-devel pciutils-devel
  - cannot provide support for cuda (cuda_runtime_api.h). 
- - Nvidia CUDA is free but not open-source therefore not in Fedora. 
+ - Nvidia CUDA is free but not open-source therefore not in Fedora.
 
 * Fri Oct 07 2011 Jirka Hladky <hladky.jiri@gmail.com> - 1.2.2-1
  - moved *.so to the devel package
diff --git a/sources b/sources
index c5de8c3..977b758 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c25e06c60a79666bcf0aebae5f9d9ea2  hwloc-1.4.tar.bz2
+39d56065c4429ab3d79acd3d446807fd  hwloc-1.4.1.tar.bz2