[hwloc/el6] Update to 1.4

Wed Feb 15 21:13:42 UTC 2012

commit 05bfa26dc41ca27aed6dbc61e7c4c2f8e0c3a704
Author: Jirka Hladky <hladky.jiri at gmail.com>
Date:   Wed Feb 15 22:13:39 2012 +0100

    Update to 1.4

 .gitignore |    1 +
 hwloc.spec |   80 +++++++++++++++++++++++++++++++++++++++---------------------
 sources    |    2 +-
 3 files changed, 54 insertions(+), 29 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 8db7c87..69d8801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hwloc-1.0.2.tar.bz2
+/hwloc-1.4.tar.bz2
diff --git a/hwloc.spec b/hwloc.spec
index aa9c457..93694be 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,13 +1,17 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   1.0.2
+Version:   1.4
 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.0/downloads/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel,libxml2-devel,cairo-devel
+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 libibverbs-devel pciutils-devel transfig doxygen w3m
+%ifnarch s390 s390x %{arm}
+BuildRequires: numactl-devel
+%endif
 
 %description
 The Portable Hardware Locality (hwloc) software package provides 
@@ -27,7 +31,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
 
 %description devel
 Headers and shared object symbolic links for the hwloc.
@@ -35,33 +38,20 @@ Headers and shared object symbolic links for the hwloc.
 %prep
 %setup -q
 
+
 %build
-# There are two options how to get rid of RPATH
-# 1) http://lists.fedoraproject.org/pipermail/packaging/2010-June/007187.html
-# Issues with 2nd approach are
-# Can I do it on all architectures?
-# rpmlint complains about "/usr/lib" in sed command line
-# To be run BEFORE %%configure
-%ifarch ppc64 s390x x86_64 ia64 alpha sparc64
-%{__sed} -i.libdir_syssearch -e '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64|' configure
-%endif
 
 %configure
-
-# 2) http://fedoraproject.org/wiki/RPath_Packaging_Draft
-# %%{__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
-# To be run AFTER %%configure
-
-
 %{__make} %{?_smp_mflags} V=1
 
 %install
-%{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
+#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 $RPM_BUILD_ROOT%{_libdir}/libhwloc.la
+%{__rm} -rf %{buildroot}%{_libdir}/libhwloc.la
 
 %{__mv} %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 %{__cp} -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}-%{version}
@@ -70,9 +60,6 @@ Headers and shared object symbolic links for the hwloc.
 %check
 %{__make} check
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -88,20 +75,57 @@ Headers and shared object symbolic links for the hwloc.
 %{_datadir}/%{name}/%{name}.dtd
 %dir %{_defaultdocdir}/%{name}-%{version}
 %{_defaultdocdir}/%{name}-%{version}/*[^c]
-%{_libdir}/libhwloc*.so.*
+%{_libdir}/libhwloc*so.*
 
 %files devel
 %defattr(-, root, root, -)
 %{_libdir}/pkgconfig/*
-%{_libdir}/libhwloc*.so
 %{_mandir}/man3/*
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_includedir}/%{name}.h
 %{_defaultdocdir}/%{name}-%{version}/*c
+%{_libdir}/*.so
 
 
 %changelog
+* Wed Feb 14 2012 Jirka Hladky  <hladky.jiri at gmail.com> - 1.4-1
+- Update to 1.4 release
+* Mon Nov 14 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1.3-1
+- Update build for ARM support
+* Sat Oct 15 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.3-0
+ - 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. 
+* Fri Oct 07 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.2.2-1
+ - moved *.so to the devel package
+ - libhwloc*so* in the main package
+* Wed Oct 05 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.2.2-0
+- 1.2.2 release
+- Fix for BZ https://bugzilla.redhat.com/show_bug.cgi?id=724937 for 32-bit PPC
+
+* Sat Sep 17 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.2.1-0
+- 1.2.1 release
+- Moved libhwloc*.so* to the main package
+
+* Mon Jun 27 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.2-0
+- 1.2 release
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-0.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan  3 2011 Dan Horák <dan[at]danny.cz> - 1.1-0.1
+- fix build on s390(x) where numactl is missing
+
+* Sat Jan  1 2011 Jirka Hladky <hladky.jiri at 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 at redhat.com> - 1.0.2-1
 - 1.0.2 release
 - added "check" section to the RPM SPEC file
diff --git a/sources b/sources
index b349480..c5de8c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54a333f64250c2ea0a438471fc329e1f  hwloc-1.0.2.tar.bz2
+c25e06c60a79666bcf0aebae5f9d9ea2  hwloc-1.4.tar.bz2
