diff --git a/.cvsignore b/.cvsignore index 04b6b2c..2413487 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -HDF4.2r2.tar.gz +HDF4.2r3.tar.gz diff --git a/hdf-4.2r2-ppc.patch b/hdf-4.2r3-ppc.patch similarity index 98% rename from hdf-4.2r2-ppc.patch rename to hdf-4.2r3-ppc.patch index 1195bc7..3b30040 100644 --- a/hdf-4.2r2-ppc.patch +++ b/hdf-4.2r3-ppc.patch @@ -67,27 +67,6 @@ diff -up HDF4.2r2/hdf/src/hdfi.h.ppc HDF4.2r2/hdf/src/hdfi.h /*#ifndef GOT_MACHINE No machine type has been defined. Your Makefile needs to have someing like -DSUN or -DUNICOS in order for the HDF internal structures to be defined -diff -up HDF4.2r2/mfhdf/libsrc/cdf.c.ppc HDF4.2r2/mfhdf/libsrc/cdf.c -diff -up HDF4.2r2/mfhdf/libsrc/hdftest.c.ppc HDF4.2r2/mfhdf/libsrc/hdftest.c -diff -up HDF4.2r2/mfhdf/libsrc/local_nc.h.ppc HDF4.2r2/mfhdf/libsrc/local_nc.h ---- HDF4.2r2/mfhdf/libsrc/local_nc.h.ppc 2007-09-17 07:01:50.000000000 +0200 -+++ HDF4.2r2/mfhdf/libsrc/local_nc.h 2007-10-17 22:48:25.000000000 +0200 -@@ -66,6 +66,15 @@ - #endif /* !macintosh */ - #endif /* NO_SYSTEM_XDR_INCLUDES */ - -+#ifndef SWAP -+#ifdef __GLIBC__ -+#include -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#define SWAP -+#endif -+#endif /* __GLIBC__ */ -+#endif /* !SWAP */ -+ - #include "netcdf.h" /* needed for defs of nc_type, ncvoid, ... */ - - /* ptr argument type in internal functions */ diff -up HDF4.2r2/mfhdf/libsrc/array.c.ppc HDF4.2r2/mfhdf/libsrc/array.c diff -up HDF4.2r2/mfhdf/libsrc/putget.c.ppc HDF4.2r2/mfhdf/libsrc/putget.c diff -up HDF4.2r2/mfhdf/libsrc/netcdf.h.in.ppc HDF4.2r2/mfhdf/libsrc/netcdf.h.in diff --git a/hdf.spec b/hdf.spec index 8b13cd5..8dae10e 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,13 +1,13 @@ Name: hdf -Version: 4.2r2 -Release: 7%{?dist} +Version: 4.2r3 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries URL: http://hdf.ncsa.uiuc.edu/hdf4.html Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/HDF%{version}.tar.gz Patch0: hdf-4.2r1p4-maxavailfiles.patch -Patch1: hdf-4.2r2-ppc.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 @@ -47,7 +47,6 @@ HDF development headers and libraries. chmod a-x *hdf/*/*.c hdf/*/*.h # restore include file timestamps modified by patching touch -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h -touch -r ./mfhdf/libsrc/local_nc.h.ppc ./mfhdf/libsrc/local_nc.h touch -r ./mfhdf/libsrc/config/netcdf-linux.h.ppc ./mfhdf/libsrc/config/netcdf-linux.h @@ -113,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 5 2008 Orion Poplawski 4.2.r3-1 +- Update to 4.2r3 + * Tue Feb 5 2008 Orion Poplawski 4.2.r2-7 - Add patch to add -lm to hdiff link diff --git a/sources b/sources index 4c9d7e2..b823432 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -088540ae11cff4dcddedafd546e0831d HDF4.2r2.tar.gz +767382a31470e795f4c4217e33a689e8 HDF4.2r3.tar.gz