From 52ff7b205f99d4e777763e9103f16e61902d9331 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Tue, 5 Feb 2008 18:58:50 +0000
Subject: [PATCH] - Add patch to support s390 (bug #431510)

---
 hdf5-1.6.6-s390.patch | 18 ++++++++++++++++++
 hdf5.spec             |  7 ++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 hdf5-1.6.6-s390.patch

diff --git a/hdf5-1.6.6-s390.patch b/hdf5-1.6.6-s390.patch
new file mode 100644
index 0000000..cc19477
--- /dev/null
+++ b/hdf5-1.6.6-s390.patch
@@ -0,0 +1,18 @@
+--- hdf5-1.6.6/fortran/src/H5f90i.h.orig	2008-02-04 19:14:01.000000000 +0100
++++ hdf5-1.6.6/fortran/src/H5f90i.h	2008-02-04 19:14:48.000000000 +0100
+@@ -125,6 +125,15 @@
+ typedef int               size_t_f;
+ #define FNAME_POST_UNDERSCORE
+ 
++/* s390/s390x specific definitions */
++#elif (defined __s390__ || defined __s390x__)
++
++typedef long long         haddr_t_f;
++typedef long long         hsize_t_f;
++typedef long long         hssize_t_f;
++typedef int               size_t_f;
++#define FNAME_POST_UNDERSCORE
++
+ /* IA64 specific definitions */
+ #elif defined __ia64
+ 
diff --git a/hdf5.spec b/hdf5.spec
index 8b45467..1679988 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -1,6 +1,6 @@
 Name: hdf5
 Version: 1.6.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -16,6 +16,7 @@ Patch7: hdf5-1.6.5-x86_64.patch
 Patch8: hdf5-1.6.5-sort.patch
 Patch10: hdf5-1.6.5-open.patch
 Patch11: hdf5-1.6.6-alpha.patch
+Patch12: hdf5-1.6.6-s390.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -48,6 +49,7 @@ HDF5 development headers and libraries.
 %patch8 -p1 -b .sort
 %patch10 -p1 -b .open
 %patch11 -p1 -b .alpha
+%patch12 -p1 -b .s390
 
 
 %build
@@ -111,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb  5 2008 Orion Poplawski <orion@cora.nwra.com> 1.6.6-5
+- Add patch to support s390 (bug #431510)
+
 * Mon Jan  7 2008 Orion Poplawski <orion@cora.nwra.com> 1.6.6-4
 - Add patches to support sparc (bug #427651)