rpms/hdf/EL-4 hdf-4.2r1p4-maxavailfiles.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 hdf.spec, 1.12, 1.13 sources, 1.2, 1.3 hdf-4.2r1-configure.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/hdf/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18494

Modified Files:
	.cvsignore hdf.spec sources 
Added Files:
	hdf-4.2r1p4-maxavailfiles.patch 
Removed Files:
	hdf-4.2r1-configure.patch 
Log Message:
- Use 4.2r1-hrepack-p4.tar.gz for hrepack patch
- Remove configure patch applied upstream
- Use --disable-production configure flag to avoid stripping -g compile flag
- Add patch to fix open file test when run under mock


hdf-4.2r1p4-maxavailfiles.patch:

--- NEW FILE hdf-4.2r1p4-maxavailfiles.patch ---
--- 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;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jul 2005 18:07:39 -0000	1.2
+++ .cvsignore	20 Apr 2007 21:19:18 -0000	1.3
@@ -1,2 +1 @@
-4.2r1-hrepack-patch.tar
-HDF4.2r1.tar.gz
+4.2r1-hrepack-p4.tar.gz


Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/EL-4/hdf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hdf.spec	11 Jun 2006 22:08:23 -0000	1.12
+++ hdf.spec	20 Apr 2007 21:19:18 -0000	1.13
@@ -1,13 +1,13 @@
 Name: hdf
 Version: 4.2r1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
 URL: http://hdf.ncsa.uiuc.edu/hdf4.html
-Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz
-Source1: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/patches/4.2r1-hrepack-patch.tar
-Patch0: hdf-4.2r1-configure.patch
+#Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz
+Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/4.2r1-hrepack-p4.tar.gz
+Patch0: hdf-4.2r1p4-maxavailfiles.patch
 Patch1: hdf-4.2r1-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel
@@ -22,6 +22,7 @@
 structure, such as images, arrays of vectors, and structured and unstructured 
 grids. You can also mix and match them in HDF files according to your needs.
 
+
 %package devel
 Summary: HDF development files
 Group: Development/Libraries
@@ -31,20 +32,21 @@
 %description devel
 HDF development headers and libraries.
 
+
 %prep
-%setup -q -n HDF%{version}
-tar xf %{SOURCE1} --directory mfhdf/hrepack 
-mv mfhdf/hrepack/4.2r1-hrepack-patch/*.[ch] mfhdf/hrepack
-rm -r mfhdf/hrepack/4.2r1-hrepack-patch
-%patch0 -p1 -b .orig
+#%setup -q -n HDF%{version}
+%setup -q -n 4.2r1-hrepack-p4
+%patch -p1 -b .maxavailfiles
 %patch1 -p1 -b .orig
 
+
 %build
 autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC -DHAVE_NETCDF"
-%configure 
+%configure --disable-production
 make
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall includedir=${RPM_BUILD_ROOT}%{_includedir}/%{name} \
@@ -52,9 +54,11 @@
 #Don't conflict with netcdf
 rm $RPM_BUILD_ROOT%{_bindir}/nc* $RPM_BUILD_ROOT%{_mandir}/man1/nc*
 
+
 %check
 make check
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -70,8 +74,15 @@
 %{_includedir}/%{name}/
 %{_libdir}/%{name}/
 
+
 %changelog
-* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com>  4.2r1-7
+* Fri Apr 20 2007 Orion Poplawski <orion at cora.nwra.com> 4.2r1-8
+- Use 4.2r1-hrepack-p4.tar.gz for hrepack patch
+- Remove configure patch applied upstream
+- Use --disable-production configure flag to avoid stripping -g compile flag
+- Add patch to fix open file test when run under mock
+
+* Thu Apr 19 2006 Orion Poplawski <orion at cora.nwra.com>  4.2r1-7
 - Add Requires netcdf-devel for hdf-devel (bug #189337)
 
 * Fri Feb 24 2006 Patrice Dumas <pertusus at free.fr> 4.2r1-6.2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jul 2005 18:07:39 -0000	1.2
+++ sources	20 Apr 2007 21:19:18 -0000	1.3
@@ -1,2 +1 @@
-d172631b6e6f32c4f93f647a09862011  4.2r1-hrepack-patch.tar
-9082c6fa913b9188452fa6c5217e1573  HDF4.2r1.tar.gz
+47e42192b00814d8f815b7b4f8243b01  4.2r1-hrepack-p4.tar.gz


--- hdf-4.2r1-configure.patch DELETED ---