diff --git a/.gitignore b/.gitignore index 1a42adb..66f6fa8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ hdf5-1.8.5.tar.bz2 /hdf5-1.8.9.tar.bz2 /hdf5-1.8.10.tar.bz2 /hdf5-1.8.11.tar.bz2 +/hdf5_1.8.10-patch1-1.debian.tar.gz diff --git a/hdf5.spec b/hdf5.spec index cf8edf2..3b551ed 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -4,7 +4,7 @@ # You need to recompile all users of HDF5 for each version change Name: hdf5 Version: 1.8.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -12,6 +12,8 @@ URL: http://www.hdfgroup.org/HDF5/ Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2 Source1: h5comp +# For man pages +Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.8.10-patch1-1.debian.tar.gz Patch0: hdf5-LD_LIBRARY_PATH.patch Patch1: hdf5-1.8.8-tstlite.patch @@ -132,7 +134,7 @@ HDF5 parallel openmpi static libraries %prep #setup -q -n %{name}-%{version}%{?snaprel} -%setup -q +%setup -q -a 2 %patch0 -p1 -b .LD_LIBRARY_PATH %ifarch ppc64 s390x # the tstlite test fails with "stack smashing detected" on these arches @@ -247,6 +249,10 @@ cat > ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/macros.hdf5 < 1.8.11-2 +- Add man pages from debian (bug #971551) + * Wed May 15 2013 Orion Poplawski 1.8.11-1 - Update to 1.8.11 diff --git a/sources b/sources index 788dc18..64842e0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3433c1be767d2b8e5b0771a3209b4fcc hdf5-1.8.11.tar.bz2 +fcb958d4541807c8498fac2d76e5a1cd hdf5_1.8.10-patch1-1.debian.tar.gz