Accepting request 122615 from devel:libraries:c_c++

- Update to 1.8.9
* Changes documented here:
  http://www.hdfgroup.org/HDF5/doc/ADGuide/Changes.html (forwarded request 122598 from ocefpaf)

OBS-URL: https://build.opensuse.org/request/show/122615
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2012-05-29 09:43:46 +00:00 committed by Git OBS Bridge
parent 7a80b12570
commit c47dbb6205
6 changed files with 60 additions and 5 deletions

24
hdf5-1.8.8-tstlite.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up hdf5-1.8.8/hl/fortran/test/Makefile.am.tstlite hdf5-1.8.8/hl/fortran/test/Makefile.am
--- hdf5-1.8.8/hl/fortran/test/Makefile.am.tstlite 2011-12-21 17:27:14.000000000 +0100
+++ hdf5-1.8.8/hl/fortran/test/Makefile.am 2011-12-21 17:27:29.000000000 +0100
@@ -33,7 +33,7 @@ else
endif
# Our main target, the test programs
-TEST_PROG=tstds tstlite tstimage tsttable
+TEST_PROG=tstds tstimage tsttable
check_PROGRAMS=$(TEST_PROG)
LDADD= $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5)
diff -up hdf5-1.8.8/hl/fortran/test/Makefile.in.tstlite hdf5-1.8.8/hl/fortran/test/Makefile.in
--- hdf5-1.8.8/hl/fortran/test/Makefile.in.tstlite 2011-12-21 17:27:21.000000000 +0100
+++ hdf5-1.8.8/hl/fortran/test/Makefile.in 2011-12-21 17:27:37.000000000 +0100
@@ -409,7 +409,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c
f1tab.h5 tstds.h5
# Our main target, the test programs
-TEST_PROG = tstds tstlite tstimage tsttable
+TEST_PROG = tstds tstimage tsttable
LDADD = $(LIBH5F_HL) $(LIBH5F) $(LIBH5_HL) $(LIBHDF5)
# Source files for the programs

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0ebb0b5478c6c0427631d4ad08f96e39f1b09fde615aa98d2a1b8fb7f6dced3
size 5827394

3
hdf5-1.8.9.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fafe54856b00f0d6531629f66e2c476ab6ee03458803088f270bbfc4a60966c7
size 6006715

12
hdf5-ph5diff.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up hdf5-1.8.8/tools/lib/h5diff.c.ph5diff hdf5-1.8.8/tools/lib/h5diff.c
--- hdf5-1.8.8/tools/lib/h5diff.c.ph5diff 2011-11-07 15:11:35.000000000 -0700
+++ hdf5-1.8.8/tools/lib/h5diff.c 2012-02-09 12:14:59.788422152 -0700
@@ -1391,7 +1391,7 @@ hsize_t diff_match(hid_t file1_id, const
options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
busyTasks--;
} /* end if */
- else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN)
+ else if(Status.MPI_TAG == MPI_TAG_DONE)
{
MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
nfound += nFoundbyWorker.nfound;

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 28 15:05:43 UTC 2012 - ocefpaf@gmail.com
- Update to 1.8.9
* Changes documented here:
http://www.hdfgroup.org/HDF5/doc/ADGuide/Changes.html
-------------------------------------------------------------------
Mon Mar 12 11:57:39 UTC 2012 - sweet_f_a@gmx.de

View File

@ -20,7 +20,7 @@
%define libname libhdf5
Name: hdf5
Version: 1.8.8
Version: 1.8.9
Release: 0
Summary: A general purpose library and file format for storing scientific data
License: BSD-3-Clause
@ -30,9 +30,16 @@ Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?s
Source1: h5comp
Patch0: hdf5-LD_LIBRARY_PATH.patch
Patch1: hdf5-non_void_return.patch
Patch2: hdf5-1.8.8-tstlite.patch
# Fix typo bug in parallel h5diff
Patch3: hdf5-ph5diff.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ gcc-fortran krb5-devel openssl-devel zlib-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: krb5-devel
BuildRequires: openssl-devel
BuildRequires: zlib-devel
%description
HDF5 is a general purpose library and file format for storing scientific data.
@ -110,6 +117,11 @@ Examples of HDF5 library use.
%setup -q
%patch0 -p1 -b .LD_LIBRARY_PATH
%patch1 -b .non_void_return
%ifarch ppc64 s390x
# the tstlite test fails with "stack smashing detected" on these arches
%patch2 -p1 -b .tstlite
%endif
%patch3 -p1 -b .ph5diff
#This should be fixed in 1.8.7
find \( -name '*.[ch]*' -o -name '*.f90' -o -name '*.txt' \) -exec chmod -x {} +