From a79c029a9400a7d96559e816203ddb8681d4fcae Mon Sep 17 00:00:00 2001 From: Jirka Hladky Date: Wed, 15 Feb 2012 01:40:48 +0100 Subject: [PATCH] Update to 1.4 --- .gitignore | 1 + hwloc.spec | 39 ++++++++------------------------------- sources | 2 +- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index c93efb5..1cbe16a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ hwloc-1.0.2.tar.bz2 /hwloc-1.2.1.tar.bz2 /hwloc-1.2.2.tar.bz2 /hwloc-1.3.tar.bz2 +/hwloc-1.4.tar.bz2 diff --git a/hwloc.spec b/hwloc.spec index e9af7e2..93694be 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,17 +1,14 @@ Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Name: hwloc -Version: 1.3 -Release: 3%{?dist} +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.3/downloads/%{name}-%{version}.tar.bz2 #Patch0: hwloc-1.2.1.patch -BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel pciutils-devel -%ifnarch s390 s390x -BuildRequires: libibverbs-devel -%endif +BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel libibverbs-devel pciutils-devel transfig doxygen w3m %ifnarch s390 s390x %{arm} BuildRequires: numactl-devel %endif @@ -43,29 +40,16 @@ Headers and shared object symbolic links for the hwloc. %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 %{__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 %{buildroot}%{_libdir}/libhwloc.la @@ -105,25 +89,18 @@ Headers and shared object symbolic links for the hwloc. %changelog -* Fri Jan 13 2012 Fedora Release Engineering - 1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Nov 18 2011 Dan Horák - 1.3-2 -- no InfiniBand on s390(x) - +* Wed Feb 14 2012 Jirka Hladky - 1.4-1 +- Update to 1.4 release * Mon Nov 14 2011 Peter Robinson - 1.3-1 - Update build for ARM support - * Sat Oct 15 2011 Jirka Hladky - 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 - 1.2.2-1 - moved *.so to the devel package - libhwloc*so* in the main package - * Wed Oct 05 2011 Jirka Hladky - 1.2.2-0 - 1.2.2 release - Fix for BZ https://bugzilla.redhat.com/show_bug.cgi?id=724937 for 32-bit PPC diff --git a/sources b/sources index 2e7b3d3..c5de8c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3ba4029ff4956727431495b642d1afb hwloc-1.3.tar.bz2 +c25e06c60a79666bcf0aebae5f9d9ea2 hwloc-1.4.tar.bz2