From ea2af300e9d2f117a361edc09e7edc43e1f0172e Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Feb 25 2009 18:11:26 +0000
Subject: - Update to 4.2r4

- Add patch to increase buffer size in test
- Drop upstreamed libm patch

---

diff --git a/.cvsignore b/.cvsignore
index 2413487..95310c5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-HDF4.2r3.tar.gz
+HDF4.2r4.tar.gz
diff --git a/hdf-4.2r2-libm.patch b/hdf-4.2r2-libm.patch
deleted file mode 100644
index 7eeae5d..0000000
--- a/hdf-4.2r2-libm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- HDF4.2r2/mfhdf/hdiff/Makefile.in.libm	2008-02-05 14:36:29.000000000 -0700
-+++ HDF4.2r2/mfhdf/hdiff/Makefile.in	2008-02-05 14:36:52.000000000 -0700
-@@ -196,7 +196,7 @@
-                 hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c       \
-                 hdiff_table.c hdiff_vs.c hdiff_dim.c
- 
--hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
-+hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a -lm
- hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
- 
- #############################################################################
---- HDF4.2r2/mfhdf/hrepack/Makefile.in.libm	2007-09-18 09:12:00.000000000 -0600
-+++ HDF4.2r2/mfhdf/hrepack/Makefile.in	2008-02-05 14:58:41.000000000 -0700
-@@ -232,7 +232,7 @@
-                        ../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c          \
-                        ../hdiff/hdiff_vs.c ../hdiff/hdiff_dim.c
- 
--test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-+test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a -lm
- test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
- hrepack_check_SOURCES = hrepack_check.c
- hrepack_check_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
diff --git a/hdf-4.2r4-buffer.patch b/hdf-4.2r4-buffer.patch
new file mode 100644
index 0000000..32968a3
--- /dev/null
+++ b/hdf-4.2r4-buffer.patch
@@ -0,0 +1,11 @@
+--- HDF4.2r4/mfhdf/libsrc/tncunlim.c.buffer	2009-01-10 19:34:26.000000000 -0700
++++ HDF4.2r4/mfhdf/libsrc/tncunlim.c	2009-02-25 11:08:46.000000000 -0700
+@@ -646,7 +646,7 @@
+     long  dimsize = 0,		/* unlimited dimension size */
+ 	  dimsize1 = 0, dimsize2 = 0; /* other dimension sizes */
+     short outdata[DIM0][DIM1][DIM2];	/* data read back */
+-    char  varname[10];		/* variable name */
++    char  varname[12];		/* variable name */
+     nc_type rh_type;		/* variable type */
+     int   rh_ndims;		/* number of dims */
+     int   rh_dims[H4_MAX_VAR_DIMS];	/* variable shape */
diff --git a/hdf.spec b/hdf.spec
index 5c075ae..e821320 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -1,6 +1,6 @@
 Name: hdf
-Version: 4.2r3
-Release: 5%{?dist}
+Version: 4.2r4
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -10,7 +10,8 @@ Patch0: hdf-4.2r3-maxavailfiles.patch
 Patch1: hdf-4.2r3-ppc.patch
 Patch2: hdf-4.2r2-sparc.patch
 Patch3: hdf-4.2r2-s390.patch
-Patch4: hdf-4.2r2-libm.patch
+# Reported upstream to help@hdfgroup.org
+Patch4: hdf-4.2r4-buffer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex byacc libjpeg-devel zlib-devel
 BuildRequires: gcc-gfortran
@@ -42,7 +43,7 @@ HDF development headers and libraries.
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .sparc
 %patch3 -p1 -b .s390
-%patch4 -p1 -b .libm
+%patch4 -p1 -b .buffer
 
 chmod a-x *hdf/*/*.c hdf/*/*.h
 # restore include file timestamps modified by patching
@@ -109,10 +110,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 25 2009 Orion Poplawski <orion@cora.nwra.com> 4.2r4-1
+- Update to 4.2r4
+- Add patch to increase buffer size in test
+- Drop upstreamed libm patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2r3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Oct  1 2008 Orion Poplawski <orion@cora.nwra.com> 4.2.r3-4
+* Wed Oct  1 2008 Orion Poplawski <orion@cora.nwra.com> 4.2r3-4
 - Rebase maxavailfiles patch
 
 * Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 4.2r3-3
diff --git a/sources b/sources
index b823432..9c0901d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-767382a31470e795f4c4217e33a689e8  HDF4.2r3.tar.gz
+cbcfcdb65f27b743c6001c17619704a8  HDF4.2r4.tar.gz