diff --git a/.gitignore b/.gitignore index 30cb5e9..95c89a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ hdf5-1.8.5.tar.bz2 /hdf5-1.8.5-patch1.tar.bz2 +/hdf5-1.8.6.tar.bz2 diff --git a/hdf5-1.8.5-tstlite.patch b/hdf5-1.8.5-tstlite.patch deleted file mode 100644 index da7797e..0000000 --- a/hdf5-1.8.5-tstlite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hdf5-1.8.5/hl/fortran/test/Makefile.in.tstlite 2010-06-04 12:26:00.000000000 -0600 -+++ hdf5-1.8.5/hl/fortran/test/Makefile.in 2010-06-23 15:04:42.461913836 -0600 -@@ -367,7 +367,7 @@ - dsetf[1-4].h5 f1img.h5 f1tab.h5 - - # Our main target, the test programs --TEST_PROG = tstlite tstimage tsttable -+TEST_PROG = tstimage tsttable - LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5) - - # Source files for the programs diff --git a/hdf5-1.8.6-tstlite.patch b/hdf5-1.8.6-tstlite.patch new file mode 100644 index 0000000..cd0f3e3 --- /dev/null +++ b/hdf5-1.8.6-tstlite.patch @@ -0,0 +1,12 @@ +diff -up hdf5-1.8.6/hl/fortran/test/Makefile.in.tstlite hdf5-1.8.6/hl/fortran/test/Makefile.in +--- hdf5-1.8.6/hl/fortran/test/Makefile.in.tstlite 2011-02-14 09:24:24.000000000 -0700 ++++ hdf5-1.8.6/hl/fortran/test/Makefile.in 2011-02-18 14:39:45.755110289 -0700 +@@ -377,7 +377,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c + f1tab.h5 + + # Our main target, the test programs +-TEST_PROG = tstlite tstimage tsttable ++TEST_PROG = tstimage tsttable + LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5) + + # Source files for the programs diff --git a/hdf5.spec b/hdf5.spec index 112d6aa..ea92421 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -1,16 +1,15 @@ %global snaprel %{nil} Name: hdf5 -Version: 1.8.5.patch1 -Release: 8%{?dist} +Version: 1.8.6 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries URL: http://www.hdfgroup.org/HDF5/ -#Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2 -Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5-patch1.tar.bz2 +Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2 Source1: h5comp Patch1: hdf5-1.8.5-longdouble.patch -Patch4: hdf5-1.8.5-tstlite.patch +Patch4: hdf5-1.8.6-tstlite.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time @@ -107,7 +106,7 @@ HDF5 parallel openmpi development files %prep #setup -q -n %{name}-%{version}%{?snaprel} -%setup -q -n %{name}-1.8.5-patch1 +%setup -q %ifarch ppc64 %patch1 -p1 -b .longdouble %endif @@ -336,6 +335,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 18 2011 Orion Poplawski 1.8.6-1 +- Update to 1.8.6-1 +- Update tstlite patch - not fixed yet + * Wed Feb 09 2011 Fedora Release Engineering - 1.8.5.patch1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index d664f5c..ed2dd43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27308a145e6c208d57db3f6f2634a0f6 hdf5-1.8.5-patch1.tar.bz2 +0b44950ed25fe66cdaab0725fa875bfe hdf5-1.8.6.tar.bz2