rpms
/
hdf
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Use 4.2r1-hrepack-p4.tar.gz for hrepack patch 

- Remove configure patch applied upstream
This commit is contained in:
Orion Poplawski 2007-04-20 17:16:29 +00:00
parent 2a491e5ed6
commit a8ca1b419c
4 changed files with 19 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cvsignore
View File

@ -1,2 +1 @@
4.2r1-hrepack-patch.tar
HDF4.2r1.tar.gz
4.2r1-hrepack-p4.tar.gz

92
hdf-4.2r1-configure.patch
View File

@ -1,92 +0,0 @@
--- HDF4.2r1/configure.ac.orig 2005-07-15 14:52:14.000000000 -0600
+++ HDF4.2r1/configure.ac 2005-07-15 14:53:35.000000000 -0600
@@ -528,7 +528,7 @@
dnl ======================================================================
AC_MSG_CHECKING([for math library support])
-AC_TRY_LINK([#include <math.h>], [sqrt(37.927)],
+AC_TRY_LINK([#include <math.h>], [sinh(37.927)],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]); LIBS="$LIBS -lm"])
--- HDF4.2r1/mfhdf/fortran/config/ftest-linux.f.orig 2005-02-08 20:04:07.000000000 -0700
+++ HDF4.2r1/mfhdf/fortran/config/ftest-linux.f 2005-07-15 15:37:22.000000000 -0600
@@ -138,13 +138,13 @@
integer*2 shval(2)
integer i, j, k
character*31 varnam, attname(2,7), gattnam(2)
- byte bytval(2)
+ integer*1 bytval(2)
common /atts/attname, gattnam
integer*2 svalidrg(2)
real rvalidrg(2)
integer lvalidrg(2)
double precision dvalidrg(2)
- byte bvalidrg(2)
+ integer*1 bvalidrg(2)
character*31 gavalue(2), cavalue(2)
real epsilon
@@ -337,7 +337,7 @@
real flval(2)
integer lngval(2)
integer*2 shval(2)
- byte bytval(2)
+ integer*1 bytval(2)
integer vartyp, nvdims, vdims(MAXVDIMS), nvatts
character*31 varnam, attname(2,7), gattnam(2)
@@ -346,7 +346,7 @@
real rvalidrg(2)
integer lvalidrg(2)
double precision dvalidrg(2)
- byte bvalidrg(2)
+ integer*1 bvalidrg(2)
character*31 gavalue(2), cavalue(2)
real epsilon
@@ -470,7 +470,7 @@
real rvalidrg(2)
integer lvalidrg(2)
double precision dvalidrg(2)
- byte bvalidrg(2)
+ integer*1 bvalidrg(2)
c variable ids
integer bid, sid, lid, fid, did, cid, chid
@@ -883,7 +883,7 @@
integer itime, ilev, ilat, ilon
c arrays of data values to be read
- byte barray(times), byval(times)
+ integer*1 barray(times), byval(times)
integer*2 sarray(times), shval(times)
integer larray(lats)
real farray(levels, lats, lons, times)
@@ -1009,7 +1009,7 @@
integer bid, sid, lid, fid, did, cid, chid
common /vars/bid, sid, lid, fid, did, cid, chid
- byte bvalue
+ integer*1 bvalue
integer*2 svalue
integer lvalue
real fvalue
@@ -1097,7 +1097,7 @@
integer count(MAXNCDIM)
c arrays of data values to be written
- byte barray(times)
+ integer*1 barray(times)
integer*2 sarray(times)
integer larray(lats)
real farray(levels, lats, lons, times)
@@ -1184,7 +1184,7 @@
integer lvalue
integer*2 svalue
- byte bvalue
+ integer*1 bvalue
double precision onethird
integer bid, sid, lid, fid, did, cid, chid
common /vars/bid, sid, lid, fid, did, cid, chid

26
hdf.spec
View File

@ -1,18 +1,18 @@
Name: hdf
Version: 4.2r1
Release: 11%{?dist}
Release: 12%{?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
Patch1: hdf-4.2r1-ppc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel
BuildRequires: gcc-gfortran
%description
HDF is a general purpose library and file format for storing scientific data.
HDF can store two primary objects: datasets and groups. A dataset is
@ -22,6 +22,7 @@ objects, one can create and store almost any kind of scientific data
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,20 @@ Requires: libjpeg-devel zlib-devel netcdf-devel
%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
%patch1 -p1 -b .orig
%build
autoconf
export CFLAGS="$RPM_OPT_FLAGS -fPIC -DHAVE_NETCDF"
%configure F77=gfortran FFLAGS=-ffixed-line-length-none
make
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall includedir=${RPM_BUILD_ROOT}%{_includedir}/%{name} \
@ -52,9 +53,11 @@ rm -rf $RPM_BUILD_ROOT
#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,7 +73,12 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/%{name}/
%{_libdir}/%{name}/
%changelog
* Fri Apr 20 2007 Orion Poplawski <orion@cora.nwra.com> 4.2r1-12
- Use 4.2r1-hrepack-p4.tar.gz for hrepack patch
- Remove configure patch applied upstream
* Tue Aug 29 2006 Orion Poplawski <orion@cora.nwra.com> 4.2r1-11
- Rebuild for FC6

3
sources
View File

@ -1,2 +1 @@
d172631b6e6f32c4f93f647a09862011 4.2r1-hrepack-patch.tar
9082c6fa913b9188452fa6c5217e1573 HDF4.2r1.tar.gz
47e42192b00814d8f815b7b4f8243b01 4.2r1-hrepack-p4.tar.gz