diff --git a/.gitignore b/.gitignore index d18263b..e859717 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ hdf-4.2.5.tar.bz2 +/hdf-4.2.6.tar.bz2 diff --git a/hdf-4.2.4-ppc.patch b/hdf-4.2.4-ppc.patch index 9669e9a..b4cbfd4 100644 --- a/hdf-4.2.4-ppc.patch +++ b/hdf-4.2.4-ppc.patch @@ -1123,18 +1123,6 @@ diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-unicos.c.ppc hdf-4.2.4-sna #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = (long *) malloc (attlen * sizeof (long)); -diff -up hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.ppc hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h ---- hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.ppc 2010-01-17 21:24:52.000000000 -0700 -+++ hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h 2010-02-01 13:19:15.307388000 -0700 -@@ -304,7 +304,7 @@ typedef double ncdouble; - */ - #if defined _CRAYMPP - typedef short nclong; --#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ -+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ - typedef int nclong; - #else - typedef long nclong; /* default, compatible type */ diff -up hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.ppc hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in --- hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.ppc 2010-01-17 21:24:53.000000000 -0700 +++ hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in 2010-02-01 13:19:15.306389107 -0700 diff --git a/hdf-4.2.4-s390.patch b/hdf-4.2.4-s390.patch index 397b615..7d6b185 100644 --- a/hdf-4.2.4-s390.patch +++ b/hdf-4.2.4-s390.patch @@ -1,6 +1,6 @@ -diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 hdf-4.2.4-snap8/hdf/src/hdfi.h ---- hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 2010-02-01 13:28:25.387386871 -0700 -+++ hdf-4.2.4-snap8/hdf/src/hdfi.h 2010-02-01 13:31:46.343387138 -0700 +diff -up hdf-4.2.6/hdf/src/hdfi.h.s390 hdf-4.2.6/hdf/src/hdfi.h +--- hdf-4.2.6/hdf/src/hdfi.h.s390 2011-06-21 16:31:39.106504782 -0600 ++++ hdf-4.2.6/hdf/src/hdfi.h 2011-06-21 16:31:39.142504332 -0600 @@ -78,6 +78,7 @@ #define DFMT_POWERPC64 0x1111 #define DFMT_LINUXPPC 0x1111 @@ -9,7 +9,7 @@ diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 hdf-4.2.4-snap8/hdf/src/hdfi.h /* I/O library constants */ #define UNIXUNBUFIO 1 -@@ -1453,6 +1454,66 @@ typedef int hdf_pint_t; +@@ -1402,6 +1403,66 @@ typedef int hdf_pint_t; #endif /* Linux Sparc32/64 */ @@ -76,9 +76,9 @@ diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 hdf-4.2.4-snap8/hdf/src/hdfi.h /*-----------------------------------------------------*/ /* 64-bit Free BSD */ -diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.s390 hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c ---- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.s390 2010-02-01 13:28:25.373389124 -0700 -+++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c 2010-02-01 13:28:25.419387130 -0700 +diff -up hdf-4.2.6/mfhdf/fortran/config/jackets-linux.c.s390 hdf-4.2.6/mfhdf/fortran/config/jackets-linux.c +--- hdf-4.2.6/mfhdf/fortran/config/jackets-linux.c.s390 2011-06-21 16:31:39.080505105 -0600 ++++ hdf-4.2.6/mfhdf/fortran/config/jackets-linux.c 2011-06-21 16:31:39.149504243 -0600 @@ -34,7 +34,7 @@ struct ncfils { /* This will be a common block from Fortran */ @@ -196,9 +196,9 @@ diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.s390 hdf-4.2.4-sna #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -diff -up hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/array.c ---- hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 2010-01-17 21:24:53.000000000 -0700 -+++ hdf-4.2.4-snap8/mfhdf/libsrc/array.c 2010-02-01 13:28:25.422387595 -0700 +diff -up hdf-4.2.6/mfhdf/libsrc/array.c.s390 hdf-4.2.6/mfhdf/libsrc/array.c +--- hdf-4.2.6/mfhdf/libsrc/array.c.s390 2007-11-15 16:40:57.000000000 -0700 ++++ hdf-4.2.6/mfhdf/libsrc/array.c 2011-06-21 16:31:39.150504231 -0600 @@ -622,7 +622,7 @@ xdr_NC_array(xdrs, app) case NC_LONG : #if defined _CRAYMPP @@ -208,10 +208,10 @@ diff -up hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/ xdr_NC_fnct = xdr_int ; #else xdr_NC_fnct = xdr_long ; -diff -up hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c ---- hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c.s390 2010-01-17 21:24:53.000000000 -0700 -+++ hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c 2010-02-01 13:28:25.424387272 -0700 -@@ -3657,7 +3657,7 @@ NC_var *vp ; +diff -up hdf-4.2.6/mfhdf/libsrc/cdf.c.s390 hdf-4.2.6/mfhdf/libsrc/cdf.c +--- hdf-4.2.6/mfhdf/libsrc/cdf.c.s390 2011-04-13 12:51:13.000000000 -0600 ++++ hdf-4.2.6/mfhdf/libsrc/cdf.c 2011-06-21 16:31:39.155504169 -0600 +@@ -3660,7 +3660,7 @@ NC_var *vp ; alen /= 4 ; #if defined _CRAYMPP xdr_NC_fnct = xdr_short; @@ -220,21 +220,21 @@ diff -up hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/cd xdr_NC_fnct = xdr_int ; #else xdr_NC_fnct = xdr_long ; -diff -up hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.s390 hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h ---- hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.s390 2010-02-01 13:28:25.380387278 -0700 -+++ hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h 2010-02-01 13:28:25.418387640 -0700 -@@ -304,7 +304,7 @@ typedef double ncdouble; +diff -up hdf-4.2.6/mfhdf/libsrc/config/netcdf-linux.h.s390 hdf-4.2.6/mfhdf/libsrc/config/netcdf-linux.h +--- hdf-4.2.6/mfhdf/libsrc/config/netcdf-linux.h.s390 2011-04-13 12:51:13.000000000 -0600 ++++ hdf-4.2.6/mfhdf/libsrc/config/netcdf-linux.h 2011-06-21 16:33:03.376451262 -0600 +@@ -300,7 +300,7 @@ typedef double ncdouble; */ #if defined _CRAYMPP typedef short nclong; --#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ -+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ ++#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ + typedef int nclong; #else - typedef long nclong; /* default, compatible type */ -diff -up hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in ---- hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.s390 2010-02-01 13:28:25.380387278 -0700 -+++ hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in 2010-02-01 13:28:25.417387775 -0700 +diff -up hdf-4.2.6/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.6/mfhdf/libsrc/netcdf.h.in +--- hdf-4.2.6/mfhdf/libsrc/netcdf.h.in.s390 2011-06-21 16:31:39.094504932 -0600 ++++ hdf-4.2.6/mfhdf/libsrc/netcdf.h.in 2011-06-21 16:31:39.159504118 -0600 @@ -295,7 +295,7 @@ typedef double ncdouble; */ #if defined _CRAYMPP @@ -244,9 +244,9 @@ diff -up hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.4-snap8/mfhdf/lib typedef int nclong; #else typedef long nclong; /* default, compatible type */ -diff -up hdf-4.2.4-snap8/mfhdf/libsrc/putget.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/putget.c ---- hdf-4.2.4-snap8/mfhdf/libsrc/putget.c.s390 2010-01-17 21:24:53.000000000 -0700 -+++ hdf-4.2.4-snap8/mfhdf/libsrc/putget.c 2010-02-01 13:28:25.421386028 -0700 +diff -up hdf-4.2.6/mfhdf/libsrc/putget.c.s390 hdf-4.2.6/mfhdf/libsrc/putget.c +--- hdf-4.2.6/mfhdf/libsrc/putget.c.s390 2009-09-07 15:02:22.000000000 -0600 ++++ hdf-4.2.6/mfhdf/libsrc/putget.c 2011-06-21 16:31:39.162504082 -0600 @@ -652,7 +652,7 @@ Void *values ; case NC_LONG : #if defined _CRAYMPP @@ -265,9 +265,9 @@ diff -up hdf-4.2.4-snap8/mfhdf/libsrc/putget.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc xdr_NC_fnct = xdr_int ; #else xdr_NC_fnct = xdr_long ; -diff -up hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c ---- hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c.s390 2010-01-17 21:24:53.000000000 -0700 -+++ hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c 2010-02-01 13:28:25.425387348 -0700 +diff -up hdf-4.2.6/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.6/mfhdf/libsrc/xdrposix.c +--- hdf-4.2.6/mfhdf/libsrc/xdrposix.c.s390 2009-03-03 15:58:27.000000000 -0700 ++++ hdf-4.2.6/mfhdf/libsrc/xdrposix.c 2011-06-21 16:31:39.165504044 -0600 @@ -283,7 +283,7 @@ int nbytes; static bool_t xdrposix_getlong(); @@ -334,9 +334,9 @@ diff -up hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.4-snap8/mfhdf/libs static bool_t xdrposix_getint(xdrs, lp) -diff -up hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l ---- hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l.s390 2010-02-01 13:28:25.381387100 -0700 -+++ hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l 2010-02-01 13:28:25.420387234 -0700 +diff -up hdf-4.2.6/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.6/mfhdf/ncgen/ncgen.l +--- hdf-4.2.6/mfhdf/ncgen/ncgen.l.s390 2011-06-21 16:31:39.096504907 -0600 ++++ hdf-4.2.6/mfhdf/ncgen/ncgen.l 2011-06-21 16:31:39.166504031 -0600 @@ -134,7 +134,7 @@ FloatInf|Infinity|Inf { /* float miss yyerror(errstr); } diff --git a/hdf-4.2.5-jpeg.patch b/hdf-4.2.5-jpeg.patch deleted file mode 100644 index bfbeee8..0000000 --- a/hdf-4.2.5-jpeg.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- hdf-4.2.5/hdf/test/rig.c.jpeg 2009-12-25 14:58:46.000000000 -0700 -+++ hdf-4.2.5/hdf/test/rig.c 2010-12-10 10:29:42.903651958 -0700 -@@ -1285,7 +1285,7 @@ - { - fprintf(stderr, "24-bit JPEG quality 80 image was incorrect\n"); - fprintf(stderr, "ret=%d, sizeof(jpeg_24bit_orig)=%u\n", (int) ret, (unsigned) sizeof(jpeg_24bit_orig)); -- num_errs++; -+ /* num_errs++; */ - } - - ret = DF24getdims(JPEGFILE, &xd, &yd, &il); -@@ -1305,7 +1305,7 @@ - { - fprintf(stderr, "24-bit JPEG quality 30 image was incorrect\n"); - fprintf(stderr, "ret=%d, sizeof(jpeg_24bit_orig)=%u\n", (int) ret, (unsigned) sizeof(jpeg_24bit_orig)); -- num_errs++; -+ /* num_errs++; */ - } - - ret = DF24getdims(JPEGFILE, &xd, &yd, &il); -@@ -1325,7 +1325,7 @@ - { - fprintf(stderr, "24-bit JPEG quality 75 image was incorrect\n"); - fprintf(stderr, "ret=%d, sizeof(jpeg_24bit_orig)=%u\n", (int) ret, (unsigned) sizeof(jpeg_24bit_orig)); -- num_errs++; -+ /* num_errs++; */ - } - - HDfree(jpeg_24bit_temp); diff --git a/hdf.spec b/hdf.spec index 9994ba8..ad0e9ef 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,6 +1,6 @@ Name: hdf -Version: 4.2.5 -Release: 3%{?dist} +Version: 4.2.6 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries @@ -10,8 +10,6 @@ Patch0: hdf-4.2.5-maxavailfiles.patch Patch1: hdf-4.2.4-ppc.patch Patch2: hdf-4.2.4-sparc.patch Patch3: hdf-4.2.4-s390.patch -# Use of jpeg-turbo disturbs jpeg tests, disable errors -Patch4: hdf-4.2.5-jpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex byacc libjpeg-devel zlib-devel %if "%{?dist}" != ".el4" @@ -48,12 +46,11 @@ HDF development headers and libraries. %patch1 -p1 -b .ppc %patch2 -p1 -b .sparc %patch3 -p1 -b .s390 -%patch4 -p1 -b .jpeg chmod a-x *hdf/*/*.c hdf/*/*.h # restore include file timestamps modified by patching touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h -touch -c -r ./mfhdf/libsrc/config/netcdf-linux.h.ppc ./mfhdf/libsrc/config/netcdf-linux.h +touch -c -r ./mfhdf/libsrc/config/netcdf-linux.h.s390 ./mfhdf/libsrc/config/netcdf-linux.h %build @@ -115,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 21 2011 Orion Poplawski 4.2.6-1 +- Update to 4.2.6 +- Drop jpeg patch, fixed upstream +- Update ppc,s390 patches + * Wed Feb 09 2011 Fedora Release Engineering - 4.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index fe276a8..3440954 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91bc17ec735b52736507570a530fe8a9 hdf-4.2.5.tar.bz2 +eed281ded7f81f6ba1a3b1b1d5109bfe hdf-4.2.6.tar.bz2