rpms/hdf5/EL-6 hdf5-1.8.0-longdouble.patch, 1.4, 1.5 hdf5.spec, 1.41, 1.42

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/hdf5/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22683

Modified Files:
	hdf5.spec 
Added Files:
	hdf5-1.8.0-longdouble.patch 
Log Message:
* Wed Jun 23 2010 Orion Poplawski <orion at cora.nwra.com> 1.8.5-2
- Re-add longdouble patch on ppc64 for EPEL builds


hdf5-1.8.0-longdouble.patch:
 dt_arith.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: hdf5-1.8.0-longdouble.patch
===================================================================
RCS file: hdf5-1.8.0-longdouble.patch
diff -N hdf5-1.8.0-longdouble.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hdf5-1.8.0-longdouble.patch	23 Jun 2010 19:43:19 -0000	1.5
@@ -0,0 +1,28 @@
+--- hdf5-1.8.0-snap6/test/dt_arith.c.longdouble	2008-05-05 16:13:15.000000000 -0600
++++ hdf5-1.8.0-snap6/test/dt_arith.c	2008-05-13 09:47:36.000000000 -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);
+@@ -5115,10 +5117,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


Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/EL-6/hdf5.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- hdf5.spec	21 Jun 2010 22:01:14 -0000	1.41
+++ hdf5.spec	23 Jun 2010 19:43:19 -0000	1.42
@@ -1,7 +1,7 @@
 %define snaprel %{nil}
 Name: hdf5
 Version: 1.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -9,6 +9,7 @@ URL: http://www.hdfgroup.org/HDF5/
 #Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
 Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}.tar.bz2
 Source1: h5comp
+Patch1: hdf5-1.8.0-longdouble.patch
 Patch3: hdf5-1.8.0-multiarch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
@@ -43,6 +44,9 @@ HDF5 static libraries.
 
 %prep
 %setup -q -n %{name}-%{version}%{?snaprel}
+%ifarch ppc64
+%patch1 -p1 -b .longdouble
+%endif
 %patch3 -p1 -b .multiarch
 find -name '*.[ch]' -o -name '*.f90' -exec chmod -x {} +
 
@@ -156,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 23 2010 Orion Poplawski <orion at cora.nwra.com> 1.8.5-2
+- Re-add longdouble patch on ppc64 for EPEL builds
+
 * Mon Jun 21 2010 Orion Poplawski <orion at cora.nwra.com> 1.8.5-1
 - Update to 1.8.5
 - Drop patches fixed upstream