rpms/hdf5/devel hdf5-1.8.0-longdouble.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 hdf5.spec, 1.26, 1.27 sources, 1.6, 1.7
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Tue May 13 15:50:06 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28655
Modified Files:
.cvsignore hdf5.spec sources
Added Files:
hdf5-1.8.0-longdouble.patch
Log Message:
* Tue May 13 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.0.snap6-1
- Update to 1.8.0-snap6
- Use new %{_fmoddir} macro
- Re-enable ppc64, disable failing tests. Failing tests are for
experimental long double support.
hdf5-1.8.0-longdouble.patch:
--- NEW FILE hdf5-1.8.0-longdouble.patch ---
--- 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 May 2008 15:59:41 -0000 1.6
+++ .cvsignore 13 May 2008 15:49:22 -0000 1.7
@@ -1 +1 @@
-hdf5-1.8.0-snap5.tar.bz2
+hdf5-1.8.0-snap6.tar.bz2
Index: hdf5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- hdf5.spec 6 May 2008 19:58:46 -0000 1.26
+++ hdf5.spec 13 May 2008 15:49:22 -0000 1.27
@@ -1,22 +1,22 @@
Name: hdf5
-Version: 1.8.0.snap5
+Version: 1.8.0.snap6
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: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz
-Source0: ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots/v18/hdf5-1.8.0-snap5.tar.bz2
+Source0: ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots/v18/hdf5-1.8.0-snap6.tar.bz2
Source1: h5comp
Patch1: hdf5-1.8.0-signal.patch
Patch2: hdf5-1.8.0-destdir.patch
Patch3: hdf5-1.8.0-multiarch.patch
Patch4: hdf5-1.8.0-scaleoffset.patch
+Patch5: hdf5-1.8.0-longdouble.patch
Patch10: hdf5-1.6.5-open.patch
Patch13: hdf5-1.6.6-free.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
-ExcludeArch: ppc64
%description
HDF5 is a general purpose library and file format for storing scientific data.
@@ -47,11 +47,14 @@
%prep
-%setup -q -n %{name}-1.8.0-snap5
+%setup -q -n %{name}-1.8.0-snap6
%patch1 -p1 -b .signal
%patch2 -p1 -b .destdir
%patch3 -p1 -b .multiarch
%patch4 -p1 -b .scaleoffset
+%ifarch ppc64
+%patch5 -p1 -b .longdouble
+%endif
%patch10 -p1 -b .open
%patch13 -p1 -b .free
@@ -80,8 +83,8 @@
make install DESTDIR=${RPM_BUILD_ROOT}
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings
#Fortran modules
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/gfortran/modules
-mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod ${RPM_BUILD_ROOT}%{_libdir}/gfortran/modules/
+mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
+mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod ${RPM_BUILD_ROOT}%{_fmoddir}
#Fixup headers and scripts for multiarch
%ifarch x86_64 ppc64 ia64 s390
@@ -150,7 +153,7 @@
%{_bindir}/h5redeploy
%{_includedir}/*.h
%{_libdir}/*.so
-%{_libdir}/gfortran/modules/*.mod
+%{_fmoddir}*.mod
%files static
%defattr(-,root,root,-)
@@ -158,6 +161,12 @@
%changelog
+* Tue May 13 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.0.snap6-1
+- Update to 1.8.0-snap6
+- Use new %%{_fmoddir} macro
+- Re-enable ppc64, disable failing tests. Failing tests are for
+ experimental long double support.
+
* Mon May 5 2008 Orion Poplawski <orion at cora.nwra.com> 1.8.0.snap5-1
- Update to 1.8.0-snap5
- Remove --enable-threadsafe, incompatible with --enable-cxx and
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hdf5/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 5 May 2008 15:59:41 -0000 1.6
+++ sources 13 May 2008 15:49:22 -0000 1.7
@@ -1 +1 @@
-e355b7a05f787748124cbd7f5eea859d hdf5-1.8.0-snap5.tar.bz2
+332514c3c19e44c3e833855e97178bda hdf5-1.8.0-snap6.tar.bz2
More information about the fedora-extras-commits
mailing list