From 65eae9eb81589dc4763ed8060ea82518de25331a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Oct 01 2008 17:59:49 +0000 Subject: - Rebase maxavailfiles patch --- diff --git a/hdf-4.2r1p4-maxavailfiles.patch b/hdf-4.2r1p4-maxavailfiles.patch deleted file mode 100644 index 9afa15d..0000000 --- a/hdf-4.2r1p4-maxavailfiles.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 4.2r1-hrepack-p4/mfhdf/libsrc/file.c.maxavailfiles 2007-04-20 12:21:12.000000000 -0600 -+++ 4.2r1-hrepack-p4/mfhdf/libsrc/file.c 2007-04-20 12:21:50.000000000 -0600 -@@ -31,7 +31,7 @@ - - /* Maximum number of files can be opened at one time; subtract 3 from - the system allowed to account for stdin, stdout, and stderr */ --#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 3) -+#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 10) - - static int _ncdf = 0 ; /* high water mark on open cdf's */ - static NC **_cdfs; diff --git a/hdf-4.2r3-maxavailfiles.patch b/hdf-4.2r3-maxavailfiles.patch new file mode 100644 index 0000000..8c7e310 --- /dev/null +++ b/hdf-4.2r3-maxavailfiles.patch @@ -0,0 +1,11 @@ +--- HDF4.2r3/mfhdf/libsrc/file.c.maxavailfiles 2008-01-27 09:47:11.000000000 -0700 ++++ HDF4.2r3/mfhdf/libsrc/file.c 2008-10-01 11:48:53.000000000 -0600 +@@ -45,7 +45,7 @@ + + /* Maximum number of files can be opened at one time; subtract 3 from + the system allowed to account for stdin, stdout, and stderr */ +-#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 3) ++#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 10) + + static int _curr_opened = 0 ; /* the number of files currently opened */ + /* NOTE: _ncdf might have been the number of files currently opened, yet it diff --git a/hdf.spec b/hdf.spec index bba2528..81dec29 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,12 +1,12 @@ Name: hdf Version: 4.2r3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries URL: http://hdfgroup.org/products/hdf4/index.html Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/HDF%{version}.tar.gz -Patch0: hdf-4.2r1p4-maxavailfiles.patch +Patch0: hdf-4.2r3-maxavailfiles.patch Patch1: hdf-4.2r3-ppc.patch Patch2: hdf-4.2r2-sparc.patch Patch3: hdf-4.2r2-s390.patch @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 1 2008 Orion Poplawski 4.2.r3-4 +- Rebase maxavailfiles patch + * Sun Sep 21 2008 Ville Skyttä - 4.2r3-3 - Fix Patch0:/%%patch mismatch.