rpms/hdf5/devel hdf5-1.6.5-h5diff_attr.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 hdf5.spec, 1.5, 1.6 sources, 1.2, 1.3 hdf5-1.6.4-h5diff_attr.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/hdf5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8042

Modified Files:
	.cvsignore hdf5.spec sources 
Added Files:
	hdf5-1.6.5-h5diff_attr.patch 
Removed Files:
	hdf5-1.6.4-h5diff_attr.patch 
Log Message:
Update to 1.6.5


hdf5-1.6.5-h5diff_attr.patch:

--- NEW FILE hdf5-1.6.5-h5diff_attr.patch ---
--- 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);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jul 2005 20:20:17 -0000	1.2
+++ .cvsignore	21 Dec 2005 21:07:16 -0000	1.3
@@ -1 +1 @@
-hdf5-1.6.4.tar.gz
+hdf5-1.6.5.tar.gz


Index: hdf5.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hdf5.spec	21 Dec 2005 17:23:13 -0000	1.5
+++ hdf5.spec	21 Dec 2005 21:07:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name: hdf5
-Version: 1.6.4
-Release: 9%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -10,10 +10,10 @@
 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.4-h5diff_attr.patch
+Patch4: hdf5-1.6.5-h5diff_attr.patch
 Patch5: hdf5-1.6.4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran
+BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
 %description
 HDF5 is a general purpose library and file format for storing scientific data.
@@ -76,6 +76,7 @@
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
+%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -94,6 +95,9 @@
 %{_libdir}/*.mod
 
 %changelog
+* Wed Dec 21 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.5-1
+- Update to 1.6.5
+
 * Wed Dec 21 2005 Orion Poplawski <orion at cora.nwra.com> 1.6.4-9
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf5/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jul 2005 20:20:17 -0000	1.2
+++ sources	21 Dec 2005 21:07:16 -0000	1.3
@@ -1 +1 @@
-a837391b633fc4c6681905d89047c032  hdf5-1.6.4.tar.gz
+67187b3253b89f1f41756b7fd4396ecf  hdf5-1.6.5.tar.gz


--- hdf5-1.6.4-h5diff_attr.patch DELETED ---