diff --git a/.gitignore b/.gitignore index 5b58286..f49b092 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ hwloc-1.0.2.tar.bz2 /hwloc-1.5.tar.bz2 /hwloc-1.5.1.tar.bz2 /hwloc-1.6.1.tar.bz2 +/hwloc-1.7.tar.bz2 diff --git a/hwloc.spec b/hwloc.spec index 1dadabf..7322fa9 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,14 +1,15 @@ Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Name: hwloc -Version: 1.6.1 -Release: 1%{?dist} +Version: 1.7 +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.6/downloads/%{name}-%{version}.tar.bz2 +Source0: http://www.open-mpi.org/software/hwloc/v1.7/downloads/%{name}-%{version}.tar.bz2 +Patch0: hwloc-1.7.patch Requires: %{name}-libs = %{version}-%{release} -BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel pciutils-devel transfig doxygen w3m +BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel libpciaccess-devel libXNVCtrl-devel transfig doxygen w3m texlive-latex texlive-makeindex libtool-ltdl-devel %ifnarch s390 s390x BuildRequires: libibverbs-devel %endif @@ -48,11 +49,13 @@ Run time libraries for the hwloc %prep %setup -q - +%patch0 -p1 %build - +autoreconf --force --install %configure +##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 %{__make} %{?_smp_mflags} V=1 %install @@ -105,6 +108,9 @@ Run time libraries for the hwloc %changelog +* Thu Jan 31 2013 Jirka Hladky - 1.7-0 +- Update to version 1.7 + * Thu Jan 31 2013 Jirka Hladky - 1.6.1-1 - Created libs package with reduced dependencies diff --git a/sources b/sources index cc3778d..20ac163 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -878e549895e0ea67590f4fb9e1f05771 hwloc-1.6.1.tar.bz2 +8b84f176cd3068e908f59674356e8ae0 hwloc-1.7.tar.bz2