- Update to 1.6.6, drop upstreamed patches

- Explicitly set compilers
epel9
Orion Poplawski 17 years ago
parent 9524502e0e
commit 6d6a47ccf9

@ -1 +1 @@
hdf5-1.6.5.tar.gz hdf5-1.6.6.tar.gz

@ -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
;;

@ -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<DIM1; i++){

@ -1,28 +0,0 @@
--- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 14:15:26.000000000 -0600
+++ hdf5-1.6.5/config/gnu-flags 2006-03-13 10:59:58.000000000 -0700
@@ -107,25 +107,6 @@
gcc*|egcs*|pgcc*)
# Architecture-specific flags
arch=
- case "$host_os-$host_cpu" in
- # FreeBSD sets the information from "uname -m" to the general machine
- # architecture, not the specific CPU for the machine, so even our
- # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD
- # machine, use the "sysctl" command to get the CPU hardware model.
- freebsd*-i386)
- host_cpu_model=`sysctl -n hw.model`
- case "$host_cpu_model" in
- # Hmm.. this might not catch Celerons, but it won't hurt them either...
- *Pro*|*II*|*III*|*IV*|*Athlon*)
- arch="-march=i686"
- ;;
- esac
- ;;
-
- *-i686)
- arch="-march=i686"
- ;;
- esac
# Host-specific flags
case "`hostname`" in

@ -1,81 +0,0 @@
--- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig 2005-12-21 12:08:45.000000000 -0700
+++ hdf5-1.6.5/tools/lib/h5diff_attr.c 2005-12-21 12:11:17.000000000 -0700
@@ -61,8 +61,8 @@
int rank2; /* rank of dataset */
hsize_t dims1[H5S_MAX_RANK];/* dimensions of dataset */
hsize_t dims2[H5S_MAX_RANK];/* dimensions of dataset */
- char name1[255];
- char name2[255];
+ char name1[255],np1[512];
+ char name2[255],np2[512];
int n1, n2, i, j;
int ret=0;
hsize_t nfound;
@@ -196,21 +196,21 @@
* array compare
*-------------------------------------------------------------------------
*/
- sprintf(name1,"%s of <%s>",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);

@ -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)

@ -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*"

@ -1,21 +1,17 @@
Name: hdf5 Name: hdf5
Version: 1.6.5 Version: 1.6.6
Release: 9%{?dist} Release: 1%{?dist}
Summary: A general purpose library and file format for storing scientific data Summary: A general purpose library and file format for storing scientific data
License: BSD License: BSD
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.hdfgroup.org/HDF5/ URL: http://www.hdfgroup.org/HDF5/
Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.gz 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 Patch1: hdf5-1.6.4-destdir.patch
Patch2: hdf5-1.6.4-norpath.patch Patch2: hdf5-1.6.4-norpath.patch
Patch3: hdf5-1.6.4-testh5repack.patch Patch3: hdf5-1.6.6-tail.patch
Patch4: hdf5-1.6.5-h5diff_attr.patch
Patch5: hdf5-1.6.4-ppc.patch Patch5: hdf5-1.6.4-ppc.patch
Patch6: hdf5-1.6.5-flags.patch
Patch7: hdf5-1.6.5-x86_64.patch Patch7: hdf5-1.6.5-x86_64.patch
Patch8: hdf5-1.6.5-sort.patch Patch8: hdf5-1.6.5-sort.patch
Patch9: hdf5-1.6.5-memset.patch
Patch10: hdf5-1.6.5-open.patch Patch10: hdf5-1.6.5-open.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
@ -39,42 +35,45 @@ HDF5 development headers and libraries.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch1 -p1 -b .destdir
%patch1 -p1 %patch2 -p1 -b .norpath
%patch2 -p1 %patch3 -p1 -b .tail
%patch3 -p1 %patch5 -p1 -b .ppc
%patch4 -p1
%patch5 -p1
%patch6 -p1 -b .flags
%patch7 -p1 -b .x86_64 %patch7 -p1 -b .x86_64
%patch8 -p1 -b .sort %patch8 -p1 -b .sort
%patch9 -p1 -b .memset
%patch10 -p1 -b .open %patch10 -p1 -b .open
%build %build
export CC=gcc
export CXX=g++
export F9X=gfortran
%configure --with-ssl --enable-cxx --enable-fortran \ %configure --with-ssl --enable-cxx --enable-fortran \
--enable-threadsafe --with-pthread --enable-threadsafe --with-pthread
make make
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
find doc/html -type f | xargs chmod -x find doc/html -type f | xargs chmod -x
%makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir}
find doc/html -name Dependencies -o -name Makefile\* | xargs rm find doc/html -name Dependencies -o -name Makefile\* | xargs rm
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings 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 %check
make check make check
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING MANIFEST README.txt release_docs/RELEASE.txt %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt
@ -104,7 +103,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/*.mod %{_libdir}/*.mod
%changelog %changelog
* Wed Oct 17 2007 Orion Poplawski <orion@cora.nwra.com> 1.6.6-1
- Update to 1.6.6, drop upstreamed patches
- Explicitly set compilers
* Fri Aug 24 2007 Orion Poplawski <orion@cora.nwra.com> 1.6.5-9 * Fri Aug 24 2007 Orion Poplawski <orion@cora.nwra.com> 1.6.5-9
- Update license tag to BSD - Update license tag to BSD
- Rebuild for BuildID - Rebuild for BuildID

@ -1 +1 @@
67187b3253b89f1f41756b7fd4396ecf hdf5-1.6.5.tar.gz 6c7fcc91f1579555d88bb10c6c9a33a9 hdf5-1.6.6.tar.gz

Loading…
Cancel
Save