diff --git a/.cvsignore b/.cvsignore index 41593cd..f72a6d6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -hdf5-1.6.5.tar.gz +hdf5-1.6.6.tar.gz diff --git a/hdf5-1.6.4-gcc4.patch b/hdf5-1.6.4-gcc4.patch deleted file mode 100644 index c9c2dc3..0000000 --- a/hdf5-1.6.4-gcc4.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- hdf5-1.6.4/fortran/config/linux-gnulibc1.BAD 2005-04-03 12:55:55.000000000 -0500 -+++ hdf5-1.6.4/fortran/config/linux-gnulibc1 2005-04-03 12:56:50.000000000 -0500 -@@ -25,7 +25,11 @@ - # The default Fortran 90 compiler - if test "X-" = "X-$F9X"; then - case $CC_BASENAME in -- gcc*|pgcc*) -+ gcc*) -+ F9X=gfortran -+ F9X_BASENAME=gfortran -+ ;; -+ pgcc*) - F9X=pgf90 - F9X_BASENAME=pgf90 - ;; diff --git a/hdf5-1.6.4-testh5repack.patch b/hdf5-1.6.4-testh5repack.patch deleted file mode 100644 index c5426b7..0000000 --- a/hdf5-1.6.4-testh5repack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hdf5-1.6.4/tools/h5repack/testh5repack_make.c.bad 2005-06-30 14:50:32.000000000 -0600 -+++ hdf5-1.6.4/tools/h5repack/testh5repack_make.c 2005-06-30 14:45:48.000000000 -0600 -@@ -896,7 +896,7 @@ - hsize_t chunk_dims[RANK]={CDIM1,CDIM2}; - int buf[DIM1][DIM2]; - int i, j, n; -- char name[5]; -+ char name[6]; - - - for (i=n=0; i",name1,path1); -- sprintf(name2,"%s of <%s>",name2,path2); -+ snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1); -+ snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2); - - /* always print name */ - if (options->m_verbose) - { -- printf( "Attribute: <%s> and <%s>\n",name1,name2); -+ printf( "Attribute: <%s> and <%s>\n",np1,np2); - nfound = diff_array(buf1, - buf2, - nelmts1, - rank1, - dims1, - options, -- name1, -- name2, -+ np1, -+ np2, - mtype1_id, - attr1_id, - attr2_id); -@@ -230,8 +230,8 @@ - rank1, - dims1, - options, -- name1, -- name2, -+ np1, -+ np2, - mtype1_id, - attr1_id, - attr2_id); -@@ -239,15 +239,15 @@ - options->m_quiet=0; - if (nfound) - { -- printf( "Attribute: <%s> and <%s>\n",name1,name2); -+ printf( "Attribute: <%s> and <%s>\n",np1,np2); - nfound = diff_array(buf1, - buf2, - nelmts1, - rank1, - dims1, - options, -- name1, -- name2, -+ np1, -+ np2, - mtype1_id, - attr1_id, - attr2_id); -@@ -263,8 +263,8 @@ - rank1, - dims1, - options, -- name1, -- name2, -+ np1, -+ np2, - mtype1_id, - attr1_id, - attr2_id); diff --git a/hdf5-1.6.5-memset.patch b/hdf5-1.6.5-memset.patch deleted file mode 100644 index 5a6d9a6..0000000 --- a/hdf5-1.6.5-memset.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hdf5-1.6.5/src/H5R.c.memset 2005-08-20 13:28:52.000000000 -0600 -+++ hdf5-1.6.5/src/H5R.c 2007-08-08 09:40:01.000000000 -0600 -@@ -190,7 +190,7 @@ - } /* end if */ - - /* Zero the heap ID out, may leak heap space if user is re-using reference and doesn't have garbage collection on */ -- HDmemset(ref,H5R_DSET_REG_REF_BUF_SIZE,0); -+ HDmemset(ref,0,H5R_DSET_REG_REF_BUF_SIZE); - - /* Get the amount of space required to serialize the selection */ - if ((buf_size = H5S_SELECT_SERIAL_SIZE(space)) < 0) diff --git a/hdf5-1.6.6-tail.patch b/hdf5-1.6.6-tail.patch new file mode 100644 index 0000000..e30b77e --- /dev/null +++ b/hdf5-1.6.6-tail.patch @@ -0,0 +1,11 @@ +--- hdf5-1.6.6/tools/h5dump/testh5dump.sh.in.tail 2007-10-17 10:37:38.000000000 -0600 ++++ hdf5-1.6.6/tools/h5dump/testh5dump.sh.in 2007-10-17 10:38:26.000000000 -0600 +@@ -81,7 +81,7 @@ + nerrors="`expr $nerrors + 1`" + else + # Skip the first three lines, which are label lines, before cmp. +- if tail +4l $expect | $CMP - $actual; then ++ if tail -n +4 $expect | $CMP - $actual; then + echo " PASSED" + else + echo "*FAILED*" diff --git a/hdf5.spec b/hdf5.spec index 8baca4b..1a440a6 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -1,21 +1,17 @@ Name: hdf5 -Version: 1.6.5 -Release: 9%{?dist} +Version: 1.6.6 +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 -Patch0: hdf5-1.6.4-gcc4.patch Patch1: hdf5-1.6.4-destdir.patch Patch2: hdf5-1.6.4-norpath.patch -Patch3: hdf5-1.6.4-testh5repack.patch -Patch4: hdf5-1.6.5-h5diff_attr.patch +Patch3: hdf5-1.6.6-tail.patch Patch5: hdf5-1.6.4-ppc.patch -Patch6: hdf5-1.6.5-flags.patch Patch7: hdf5-1.6.5-x86_64.patch Patch8: hdf5-1.6.5-sort.patch -Patch9: hdf5-1.6.5-memset.patch Patch10: hdf5-1.6.5-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time @@ -39,42 +35,45 @@ HDF5 development headers and libraries. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -b .flags +%patch1 -p1 -b .destdir +%patch2 -p1 -b .norpath +%patch3 -p1 -b .tail +%patch5 -p1 -b .ppc %patch7 -p1 -b .x86_64 %patch8 -p1 -b .sort -%patch9 -p1 -b .memset %patch10 -p1 -b .open + %build +export CC=gcc +export CXX=g++ +export F9X=gfortran %configure --with-ssl --enable-cxx --enable-fortran \ --enable-threadsafe --with-pthread make + %install rm -rf $RPM_BUILD_ROOT find doc/html -type f | xargs chmod -x %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} find doc/html -name Dependencies -o -name Makefile\* | xargs rm rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings -# Don't instal h5perf until h5test.so.0 issues is sorted out -rm $RPM_BUILD_ROOT/%{_bindir}/h5perf + %check make check + %clean rm -rf $RPM_BUILD_ROOT + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %files %defattr(-,root,root,-) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt @@ -104,7 +103,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %{_libdir}/*.mod + %changelog +* Wed Oct 17 2007 Orion Poplawski 1.6.6-1 +- Update to 1.6.6, drop upstreamed patches +- Explicitly set compilers + * Fri Aug 24 2007 Orion Poplawski 1.6.5-9 - Update license tag to BSD - Rebuild for BuildID diff --git a/sources b/sources index f8965a0..6d3e974 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67187b3253b89f1f41756b7fd4396ecf hdf5-1.6.5.tar.gz +6c7fcc91f1579555d88bb10c6c9a33a9 hdf5-1.6.6.tar.gz