From 8a26f2436f5f303ecf4eaf80a544f12659c24c1f Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Wed, 1 Jun 2011 14:03:07 +0200
Subject: [PATCH] drop obsolete longdouble patch (PPC64 only)

---
 hdf5-1.8.5-longdouble.patch | 28 ----------------------------
 hdf5.spec                   |  8 ++++----
 2 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 hdf5-1.8.5-longdouble.patch

diff --git a/hdf5-1.8.5-longdouble.patch b/hdf5-1.8.5-longdouble.patch
deleted file mode 100644
index f524951..0000000
--- a/hdf5-1.8.5-longdouble.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- hdf5-1.8.5/test/dt_arith.c.longdouble	2010-06-04 08:24:13.000000000 -0600
-+++ hdf5-1.8.5/test/dt_arith.c	2010-06-23 14:43:49.143913473 -0600
-@@ -4929,10 +4929,12 @@
-     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_USHORT, H5T_NATIVE_LDOUBLE);
-     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_INT, H5T_NATIVE_LDOUBLE);
-     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_UINT, H5T_NATIVE_LDOUBLE);
-+/* Fails on ppc64
- #if H5_SIZEOF_LONG!=H5_SIZEOF_INT
-     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_LONG, H5T_NATIVE_LDOUBLE);
-     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_ULONG, H5T_NATIVE_LDOUBLE);
- #endif
-+*/
- #if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG
- #if H5_LLONG_TO_LDOUBLE_CORRECT
-     nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_LLONG, H5T_NATIVE_LDOUBLE);
-@@ -5094,10 +5096,12 @@
- #endif
-         }
- #endif /*H5_LDOUBLE_TO_UINT_ACCURATE*/
-+/* Fails on ppc64
- #if H5_SIZEOF_LONG!=H5_SIZEOF_INT && H5_SIZEOF_LONG_DOUBLE!=0
-         nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG);
-         nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULONG);
- #endif
-+*/
- 
- #if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG && H5_SIZEOF_LONG_DOUBLE!=0
- #ifdef H5_LDOUBLE_TO_LLONG_ACCURATE
diff --git a/hdf5.spec b/hdf5.spec
index 3440eec..dd5c17a 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.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -110,9 +110,6 @@ HDF5 parallel openmpi development files
 %prep
 #setup -q -n %{name}-%{version}%{?snaprel}
 %setup -q
-%ifarch ppc64
-%patch1 -p1 -b .longdouble
-%endif
 %patch4 -p1 -b .tstlite
 #This should be fixed in 1.8.7
 find \( -name '*.[ch]*' -o -name '*.f90' -o -name '*.txt' \) -exec chmod -x {} +
@@ -340,6 +337,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 01 2011 Karsten Hopp <karsten@redhat.com> 1.8.7-2
+- drop ppc64 longdouble patch, not required anymore
+
 * Tue May 17 2011 Orion Poplawski <orion@cora.nwra.com> 1.8.7-1
 - Update to 1.8.7