Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -3,3 +3,11 @@ hdf-4.2.5.tar.bz2
 /hdf-4.2.7.tar.bz2
 /hdf-4.2.8.tar.bz2
 /hdf-4.2.9.tar.bz2
+/hdf-4.2.10.tar.bz2
+/hdf-4.2.11.tar.bz2
+/hdf-4.2.12.tar.bz2
+/hdf-4.2.13.tar.bz2
+/hdf-4.2.14.tar.bz2
+/hdf-4.2.15.tar.bz2
+/hdf-4.2.16-2.tar.bz2
+/hdf4.3.0.tar.gz

h4comp

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+BITS=32
+[ -d /usr/lib64 ] && BITS=64
+
+exec $0-${BITS} "$@"

hdf-4.2.4-s390.patch

@@ -1,348 +0,0 @@
-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
- #define     DFMT_LINUXSPARC     0x1111
-+#define     DFMT_LINUX390       0x1111
- 
- /* I/O library constants */
- #define UNIXUNBUFIO 1
-@@ -1402,6 +1403,66 @@ typedef int               hdf_pint_t;   
- 
- #endif /* Linux Sparc32/64 */
- 
-+/* Linux s390/s390x */
-+#if defined __s390__ || defined __s390x__
-+
-+#ifdef GOT_MACHINE
-+If you get an error on this line more than one machine type has been defined.
-+Please check your Makefile.
-+#endif
-+#define GOT_MACHINE
-+
-+#include <sys/file.h>               /* for unbuffered i/o stuff */
-+#include <sys/stat.h>
-+#define DF_MT             DFMT_LINUX390
-+typedef void              VOID;
-+typedef void              *VOIDP;
-+typedef char              *_fcd;
-+typedef char              char8;
-+typedef unsigned char     uchar8;
-+typedef char              int8;
-+typedef unsigned char     uint8;
-+typedef short int         int16;
-+typedef unsigned short int uint16;
-+#ifdef __s390x__ /* 64-bit environment */
-+typedef int               int32;
-+typedef unsigned int      uint32;
-+#else /* 32-bit environment */
-+typedef long int          int32;
-+typedef unsigned long int uint32;
-+#endif
-+typedef int               intn;
-+typedef unsigned int      uintn;
-+typedef int               intf;     /* size of INTEGERs in Fortran compiler */
-+typedef float             float32;
-+typedef double            float64;
-+#ifdef __s390x__ /* 64-bit environment */
-+typedef long              hdf_pint_t;   /* an integer the same size as a pointer */
-+#else /* 32-bit environment */
-+typedef int               hdf_pint_t;   /* an integer the same size as a pointer */
-+#endif
-+#define FNAME_POST_UNDERSCORE
-+#define _fcdtocp(desc) (desc)
-+#ifdef  HAVE_FMPOOL
-+#define FILELIB PAGEBUFIO  /* enable page buffering */
-+#else
-+#define FILELIB UNIXBUFIO
-+#endif
-+
-+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
-+
-+/* Determine the memory manager we are going to use. Valid values are: */
-+/*  MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS.  See the JPEG docs for details on */
-+/*  what each does */
-+#define JMEMSYS         MEM_ANSI
-+
-+#ifdef __GNUC__
-+#define HAVE_STDC
-+#define INCLUDES_ARE_ANSI
-+#endif
-+
-+#endif /* Linux s390/s390x */
-+
- /*-----------------------------------------------------*/
- /* 64-bit Free BSD */
- 
-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 */
-     double dd;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-     int ll;
- #else
-     long ll;
-@@ -65,7 +65,7 @@ struct ncfils {			/* This will be a comm
- 
- struct ncfils {			/* This will be a common block from Fortran */
-     double dd;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-     int ll;
- #else
-     long ll;
-@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims)
- }
- #endif /* FORTRAN_HAS_NO_SHORT */
- 
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- /*
-  * Convert multi-dimensional array of NCLONGs stored in ints to packed
-  * array of longs, in malloc'ed space.  Returns pointer to longs or NULL
-@@ -916,7 +916,7 @@ nncvpt1(cdfid, varid, indices, value, rc
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long          longs = *(int *)value;
-@@ -1030,7 +1030,7 @@ nncvpt(cdfid, varid, start, count, value
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itol (value, ncount, ndims);
-@@ -1141,7 +1141,7 @@ nncvptg(cdfid, varid, start, count, stri
- 	tmpbasis	= nctypelen(NC_LONG);
-     else
- #endif
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-     if (datatype == NC_LONG)
- 	tmpbasis	= sizeof(int);
-     else
-@@ -1198,7 +1198,7 @@ nncvptg(cdfid, varid, start, count, stri
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itolg (value, ncount, nbasis, ndims);
-@@ -1334,7 +1334,7 @@ nncvgt1(cdfid, varid, indices, value, rc
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long          longs;
-@@ -1476,7 +1476,7 @@ nncvgt(cdfid, varid, start, count, value
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long iocount = dimprod (ncount, ndims);	/* product of dimensions */
-@@ -1614,7 +1614,7 @@ nncvgtg(cdfid, varid, start, count, stri
- 	tmpbasis	= nctypelen(NC_LONG);
-     else
- #endif
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-     if (datatype == NC_LONG)
- 	tmpbasis	= sizeof(int);
-     else
-@@ -1685,7 +1685,7 @@ nncvgtg(cdfid, varid, start, count, stri
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long iocount = dimprod (ncount, ndims);	/* product of dimensions */
-@@ -1851,7 +1851,7 @@ nncapt(cdfid, varid, attname, datatype, 
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- #ifdef HDF
-     if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itol (value, attlen, 1);
-@@ -2016,7 +2016,7 @@ nncagt(cdfid, varid, attname, value, rco
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- #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.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
- 		xdr_NC_fnct = xdr_short;
--#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__
- 		xdr_NC_fnct = xdr_int ;
- #else
- 		xdr_NC_fnct = xdr_long ;
-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;
--#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__
-         xdr_NC_fnct = xdr_int ;
- #else
-         xdr_NC_fnct = xdr_long ;
-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 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
-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
- typedef short	nclong;
--#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
-+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__ || defined __s390x__
- typedef int     nclong;   
- #else
- typedef long    nclong;         /* default, compatible type */
-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
- 		return( xdr_short(xdrs, (nclong *)values) ) ;
--#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__
- 		return( xdr_int(xdrs, (nclong *)values) ) ;
- #else
- 		return( xdr_long(xdrs, (nclong *)values) ) ;
-@@ -1966,7 +1966,7 @@ Void *values ;
- 	case NC_LONG :
- #if defined _CRAYMPP
-                 xdr_NC_fnct = xdr_short;
--#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__
- 		xdr_NC_fnct = xdr_int ;
- #else
- 		xdr_NC_fnct = xdr_long ;
-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();
- static bool_t   xdrposix_putlong();
--#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- static bool_t   xdrposix_getint();
- static bool_t   xdrposix_putint();
- #endif
-@@ -300,7 +300,7 @@ static long *    xdrposix_inline();
- #if (defined __sun && defined _LP64)
- static rpc_inline_t *    xdrposix_inline();
- #else
--#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__
-+#if ((defined __x86_64__ ) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
- static int32_t *    xdrposix_inline();
- #else
- #if (defined __alpha )
-@@ -331,9 +331,9 @@ static struct xdr_ops   xdrposix_ops = {
-     xdrposix_getpos,    /* get offset in the stream */
-     xdrposix_setpos,    /* set offset in the stream */
-     xdrposix_inline,    /* prime stream for inline macros */
--#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
-+#if (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
-     xdrposix_destroy,   /* destroy stream */
--#if !(defined __x86_64__) && !(defined __powerpc64__) || (defined  __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
-+#if !(defined __s390x__) && !(defined __x86_64__) && !(defined __powerpc64__) || (defined  __sun && defined _LP64) /* i.e. we are on SUN/Intel in 64-bit mode */
-     NULL,               /* no xdr_control function defined */
- #endif 
-     /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
-@@ -468,7 +468,7 @@ xdrposix_getlong(xdrs, lp)
- #endif
- {
-     unsigned char *up = (unsigned char *)lp ;
--#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || (defined __hpux && __LP64__))  
-+#if (defined CRAY || defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))  
-     *lp = 0 ;
-     up += (sizeof(long) - 4) ;
- #endif
-@@ -495,7 +495,7 @@ xdrposix_putlong(xdrs, lp)
-     netlong mycopy = htonl(*lp);
-     up = (unsigned char *)&mycopy;
- #endif
--#if (defined CRAY || defined AIX5L64  || defined __powerpc64__ || (defined __hpux && __LP64__))
-+#if (defined CRAY || defined AIX5L64  || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
-     up += (sizeof(long) - 4) ;
- #endif
- 
-@@ -592,7 +592,7 @@ static rpc_inline_t *
- #if (defined  __alpha)
- static int* 
- #else
--#if ((defined  __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__
-+#if ((defined  __x86_64__) && !(defined __sun && defined _LP64)) || defined __powerpc64__ || defined __s390x__
- static int32_t * 
- #else
- static netlong * 
-@@ -621,7 +621,7 @@ int 
-     return (NULL);
- }
- 
--#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64  || defined __x86_64__ || defined __powerpc64__
-+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64  || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- 
- static bool_t
- xdrposix_getint(xdrs, lp)
-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);
- 		}
- 
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
- 		if (dd < INT_MIN  ||  dd > INT_MAX) 
- #else
- #if defined (_CRAYMPP)

hdf-4.2.4-sparc.patch

@@ -1,78 +0,0 @@
-diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.sparc hdf-4.2.4-snap8/hdf/src/hdfi.h
---- hdf-4.2.4-snap8/hdf/src/hdfi.h.sparc	2010-02-01 13:28:25.361387271 -0700
-+++ hdf-4.2.4-snap8/hdf/src/hdfi.h	2010-02-01 13:31:46.343387138 -0700
-@@ -77,6 +77,7 @@
- #define     DFMT_LINUX64        0x4441
- #define     DFMT_POWERPC64      0x1111
- #define     DFMT_LINUXPPC       0x1111
-+#define     DFMT_LINUXSPARC     0x1111
- 
- /* I/O library constants */
- #define UNIXUNBUFIO 1
-@@ -1392,6 +1393,66 @@ typedef long              hdf_pint_t;   
- 
- #endif /*Linux PPC */
- 
-+/* Linux Sparc32/64 */
-+#if defined __sparc__ || defined __sparc64__
-+
-+#ifdef GOT_MACHINE
-+If you get an error on this line more than one machine type has been defined.
-+Please check your Makefile.
-+#endif
-+#define GOT_MACHINE
-+
-+#include <sys/file.h>               /* for unbuffered i/o stuff */
-+#include <sys/stat.h>
-+#define DF_MT             DFMT_LINUXPPC
-+typedef void              VOID;
-+typedef void              *VOIDP;
-+typedef char              *_fcd;
-+typedef char              char8;
-+typedef unsigned char     uchar8;
-+typedef char              int8;
-+typedef unsigned char     uint8;
-+typedef short int         int16;
-+typedef unsigned short int uint16;
-+#ifdef _LP64 /* 64-bit environment */
-+typedef int               int32;
-+typedef unsigned int      uint32;
-+#else /* 32-bit environment */
-+typedef long int          int32;
-+typedef unsigned long int uint32;
-+#endif
-+typedef int               intn;
-+typedef unsigned int      uintn;
-+typedef int               intf;     /* size of INTEGERs in Fortran compiler */
-+typedef float             float32;
-+typedef double            float64;
-+#ifdef _LP64 /* 64-bit environment */
-+typedef long              hdf_pint_t;   /* an integer the same size as a pointer */
-+#else /* 32-bit environment */
-+typedef int               hdf_pint_t;   /* an integer the same size as a pointer */
-+#endif
-+#define FNAME_POST_UNDERSCORE
-+#define _fcdtocp(desc) (desc)
-+#ifdef  HAVE_FMPOOL
-+#define FILELIB PAGEBUFIO  /* enable page buffering */
-+#else
-+#define FILELIB UNIXBUFIO
-+#endif
-+
-+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
-+
-+/* Determine the memory manager we are going to use. Valid values are: */
-+/*  MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS.  See the JPEG docs for details on */
-+/*  what each does */
-+#define JMEMSYS         MEM_ANSI
-+
-+#ifdef __GNUC__
-+#define HAVE_STDC
-+#define INCLUDES_ARE_ANSI
-+#endif
-+
-+#endif /* Linux Sparc32/64 */
-+
- /*-----------------------------------------------------*/
- /* 64-bit Free BSD */
- 

hdf-4.2.5-maxavailfiles.patch

@@ -1,11 +0,0 @@
---- hdf-4.2.5-pre1/mfhdf/libsrc/file.c.maxavailfiles	2010-02-06 10:40:42.000000000 -0700
-+++ hdf-4.2.5-pre1/mfhdf/libsrc/file.c	2010-02-09 13:53:09.600285597 -0700
-@@ -51,7 +51,7 @@
-    be in hlimits.h file in the future. EIP 2010-02-01*/
- 
- #define H4_MAX_AVAIL_OPENFILES 20000
--#define MAX_AVAIL_OPENFILES  (((MAX_SYS_OPENFILES - 3) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 3)) 
-+#define MAX_AVAIL_OPENFILES  (((MAX_SYS_OPENFILES - 10) > H4_MAX_AVAIL_OPENFILES) ? H4_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

hdf-4.2.7-arm.patch

@@ -1,81 +0,0 @@
-diff -r -U 3 -p hdf-4.2.7.orig/hdf/src/hconv.h hdf-4.2.7/hdf/src/hconv.h
---- hdf-4.2.7.orig/hdf/src/hconv.h	2012-02-06 09:02:43.000000000 -0500
-+++ hdf-4.2.7/hdf/src/hconv.h	2012-03-07 01:58:21.713088567 -0500
-@@ -63,7 +63,7 @@
- /* CONSTANT DEFINITIONS                                                      */
- /*****************************************************************************/
- /* Generally Big-Endian machines */
--#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__)
-+#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__)
- #   if !defined(UNICOS)
- #       define UI8_IN     DFKnb1b   /* Unsigned Integer, 8 bits */
- #       define UI8_OUT    DFKnb1b
-diff -r -U 3 -p hdf-4.2.7.orig/hdf/src/hdfi.h hdf-4.2.7/hdf/src/hdfi.h
---- hdf-4.2.7.orig/hdf/src/hdfi.h	2012-02-06 09:02:43.000000000 -0500
-+++ hdf-4.2.7/hdf/src/hdfi.h	2012-03-06 23:12:43.941269780 -0500
-@@ -79,6 +79,7 @@
- #define     DFMT_LINUXPPC       0x1111
- #define     DFMT_LINUXSPARC     0x1111
- #define     DFMT_LINUX390       0x1111
-+#define     DFMT_LINUXARM       0x4441
- 
- /* I/O library constants */
- #define UNIXUNBUFIO 1
-@@ -1463,6 +1464,57 @@ typedef int               hdf_pint_t;
- 
- #endif /* Linux s390/s390x */
- 
-+/* Linux ARM */
-+#if defined __arm__
-+
-+#ifdef GOT_MACHINE
-+If you get an error on this line more than one machine type has been defined.
-+Please check your Makefile.
-+#endif
-+#define GOT_MACHINE
-+
-+#include <sys/file.h>               /* for unbuffered i/o stuff */
-+#include <sys/stat.h>
-+#define DF_MT             DFMT_LINUXARM
-+typedef void              VOID;
-+typedef void              *VOIDP;
-+typedef char              *_fcd;
-+typedef char              char8;
-+typedef unsigned char     uchar8;
-+typedef char              int8;
-+typedef unsigned char     uint8;
-+typedef short int         int16;
-+typedef unsigned short int uint16;
-+typedef long int          int32;
-+typedef unsigned long int uint32;
-+typedef int               intn;
-+typedef unsigned int      uintn;
-+typedef int               intf;     /* size of INTEGERs in Fortran compiler */
-+typedef float             float32;
-+typedef double            float64;
-+typedef int               hdf_pint_t;   /* an integer the same size as a pointer */
-+#define FNAME_POST_UNDERSCORE
-+#define _fcdtocp(desc) (desc)
-+#ifdef  HAVE_FMPOOL
-+#define FILELIB PAGEBUFIO  /* enable page buffering */
-+#else
-+#define FILELIB UNIXBUFIO
-+#endif
-+
-+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
-+
-+/* Determine the memory manager we are going to use. Valid values are: */
-+/*  MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS.  See the JPEG docs for details on */
-+/*  what each does */
-+#define JMEMSYS         MEM_ANSI
-+
-+#ifdef __GNUC__
-+#define HAVE_STDC
-+#define INCLUDES_ARE_ANSI
-+#endif
-+
-+#endif /* Linux ARM */
-+
- /*-----------------------------------------------------*/
- /* 64-bit Free BSD */
- 

hdf-build.patch

@@ -0,0 +1,53 @@
+diff -up hdf4-master/java/src/jni/Makefile.am.build hdf4-master/java/src/jni/Makefile.am
+--- hdf4-master/java/src/jni/Makefile.am.build	2024-02-06 22:11:46.219972170 -0700
++++ hdf4-master/java/src/jni/Makefile.am	2024-02-06 22:12:33.262288868 -0700
+@@ -16,7 +16,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src
+           $(JNIFLAGS)
+ 
+ # This is our main target
+-lib_LTLIBRARIES=libhdf_java.la
++pkglib_LTLIBRARIES=libhdf_java.la
++
++# No soname for JNI library
++libhdf_java_la_LDFLAGS = -avoid-version
+ 
+ # Source files for the library
+ libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \
+diff -up hdf4-master/java/src/Makefile.am.build hdf4-master/java/src/Makefile.am
+--- hdf4-master/java/src/Makefile.am.build	2024-02-06 17:40:20.000000000 -0700
++++ hdf4-master/java/src/Makefile.am	2024-02-06 22:11:46.219972170 -0700
+@@ -13,8 +13,8 @@ JAVAROOT = .classes
+ classes:
+ 	test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
+ 
+-jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
+-hdf_javadir = $(libdir)
++jarfile = $(PACKAGE_TARNAME).jar
++hdf_javadir = $(prefix)/lib/java
+ 
+ pkgpath = hdf/hdflib
+ CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH
+diff -up hdf4-master/java/test/junit.sh.in.build hdf4-master/java/test/junit.sh.in
+--- hdf4-master/java/test/junit.sh.in.build	2024-02-06 17:40:20.000000000 -0700
++++ hdf4-master/java/test/junit.sh.in	2024-02-06 22:11:46.219972170 -0700
+@@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
+ BLDLIBDIR="$top_builddir/hdf4/lib"
+ BLDDIR="."
+ HDFTEST_HOME="$top_srcdir/java/test"
+-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
++JARFILE=@PACKAGE_TARNAME@.jar
+ TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
+ test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
+ 
+diff -up hdf4-master/java/test/Makefile.am.build hdf4-master/java/test/Makefile.am
+--- hdf4-master/java/test/Makefile.am.build	2024-02-06 17:40:20.000000000 -0700
++++ hdf4-master/java/test/Makefile.am	2024-02-06 22:11:46.219972170 -0700
+@@ -12,7 +12,7 @@ classes:
+ 	test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
+ 
+ pkgpath = test
+-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
++hdfjarfile = $(PACKAGE_TARNAME).jar
+ CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
+ 
+ jarfile = jar$(PACKAGE_TARNAME)test.jar

hdf-declaration.patch

@@ -1,76 +0,0 @@
-diff -up hdf-4.2.9/hdf/src/df24ff.f.declaration hdf-4.2.9/hdf/src/df24ff.f
---- hdf-4.2.9/hdf/src/df24ff.f.declaration	2013-02-07 21:44:52.000000000 -0700
-+++ hdf-4.2.9/hdf/src/df24ff.f	2013-02-15 16:48:08.490664851 -0700
-@@ -117,7 +117,7 @@ C---------------------------------------
- 
-       integer function d2rref(name, ref)
-       character*(*) name
--      integer ref
-+      integer ref, d2irref
- 
-       d2rref = d2irref(name, ref, len(name))
-       return
-@@ -136,6 +136,7 @@ C---------------------------------------
- 
-       integer function d2nimg(name)
-       character*(*) name
-+      integer d2inimg
- 
-       d2nimg = d2inimg(name, len(name))
-       return
-@@ -230,7 +231,7 @@ C---------------------------------------
- 
-       integer function df24readref(name, ref)
-       character*(*) name
--      integer ref
-+      integer ref, d2irref
- 
-       df24readref = d2irref(name, ref, len(name))
-       return
-diff -up hdf-4.2.9/hdf/src/dfufp2iff.f.declaration hdf-4.2.9/hdf/src/dfufp2iff.f
---- hdf-4.2.9/hdf/src/dfufp2iff.f.declaration	2013-02-07 21:44:52.000000000 -0700
-+++ hdf-4.2.9/hdf/src/dfufp2iff.f	2013-02-15 16:53:28.367159528 -0700
-@@ -49,7 +49,7 @@ C---------------------------------------
-       real          max, min, hscale, vscale, data
-       character*(*) palette
-       character*(*) outfile
--      integer       ctmethod, hres, vres, compress
-+      integer       ctmethod, hres, vres, compress, duif2i
- 
-       duf2im = duif2i(hdim,vdim,max,min,hscale,vscale,data,palette,
-      *              outfile,ctmethod,hres,vres,compress, len(outfile))        
-@@ -85,7 +85,7 @@ C---------------------------------------
-       real          max, min, hscale, vscale, data
-       character*(*) palette
-       character*(*) outfile
--      integer       ctmethod, hres, vres, compress
-+      integer       ctmethod, hres, vres, compress, duif2i
- 
-       dfufptoimage = 
-      *             duif2i(hdim,vdim,max,min,hscale,vscale,data,palette,
-diff -up hdf-4.2.9/hdf/src/vg.c.declaration hdf-4.2.9/hdf/src/vg.c
---- hdf-4.2.9/hdf/src/vg.c.declaration	2013-02-07 21:44:52.000000000 -0700
-+++ hdf-4.2.9/hdf/src/vg.c	2013-02-15 16:44:05.731947549 -0700
-@@ -81,6 +81,7 @@ PRIVATE int32 matchnocase
-             (char *strx, char *stry);
- #endif /* VDATA_FIELDS_ALL_UPPER */
- 
-+
- #ifdef VDATA_FIELDS_ALL_UPPER
- /*-----------------------------------------------------------------
- NAME
-@@ -116,6 +117,14 @@ matchnocase(char *strx, /* IN: first str
- }   /* matchnocase */
- #endif /* VDATA_FIELDS_ALL_UPPER */
- 
-+/* Forward declarations */
-+intn
-+VSIgetvdatas(int32 id,	
-+	    const char *vsclass,
-+	    const uintn start_vd,
-+            const uintn n_vds,
-+            uint16 *refarray);
-+
- /* ------------------------------------------------------------------
- NAME
-    VSelts -- get number of elements in a vdata

hdf-wrap.patch

@@ -1,35 +0,0 @@
-diff -up hdf-4.2.9/hdf/test/sdmms.c.wrap hdf-4.2.9/hdf/test/sdmms.c
---- hdf-4.2.9/hdf/test/sdmms.c.wrap	2013-02-07 21:44:52.000000000 -0700
-+++ hdf-4.2.9/hdf/test/sdmms.c	2013-02-16 20:33:39.118623828 -0700
-@@ -63,9 +63,10 @@ static int32 ical5;
- void
- test_sdmms(void)
- {
--    int         i, j, err, err1, err2, ret;
--    intn        rank;
--    int32       dims[2];
-+    uint32       i, j;
-+    int          err, err1, err2, ret;
-+    intn         rank;
-+    int32        dims[2];
- 
-     rank = 2;
-     dims[0] = 10;
-@@ -87,7 +88,7 @@ test_sdmms(void)
-                 ui16[i][j] = (uint16) ((i * 6000) + j);     /* range: 0 ~ 60000 */
- 
-                 i32[i][j] = (int32) ((i * 60000) - 300000 + j);     /* range: 0 ~ 2-billion */
--                ui32[i][j] = (uint32) ((i * 400000000) + j);    /* range: 0 ~ 4-billion */
-+                ui32[i][j] = (uint32) ((i * 400000000U) + j);    /* range: 0 ~ 4-billion */
-             }
- 
-           f32scale[i] = (float32) ((i * 40) + j);   /* range: 0 ~ 4-billion */
-@@ -99,7 +100,7 @@ test_sdmms(void)
-           ui16scale[i] = (uint16) ((i * 6000) + j);     /* range: 0 ~ 60000 */
- 
-           i32scale[i] = (int32) ((i * 60000) - 300000 + j);     /* range: 0 ~ 2-billion */
--          ui32scale[i] = (uint32) ((i * 400000000) + j);    /* range: 0 ~ 4-billion */
-+          ui32scale[i] = (uint32) ((i * 400000000U) + j);    /* range: 0 ~ 4-billion */
-       }
- 
-     cal1 = (float64) 10.0;

hdf.spec

@@ -1,125 +1,443 @@
-Name: hdf
-Version: 4.2.9
-Release: 1%{?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/%{name}-%{version}.tar.bz2
-Patch0: hdf-4.2.5-maxavailfiles.patch
-Patch1: hdf-ppc.patch
-Patch2: hdf-4.2.4-sparc.patch
-Patch3: hdf-4.2.4-s390.patch
-Patch4: hdf-4.2.7-arm.patch
-# Add some missing declarations
-Patch5: hdf-declaration.patch
-# Patch to fix integer wrapping in test
-Patch6: hdf-wrap.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flex byacc libjpeg-devel zlib-devel
-%if "%{?dist}" != ".el4"
-BuildRequires: gcc-gfortran
+# No more Java on i686
+%ifarch %{java_arches}
+%bcond_without java
 %else
-BuildRequires: gcc-g77
+%bcond_with java
 %endif
 
+Name: hdf
+Version: 4.3.0
+Release: 4%{?dist}
+Summary: A general purpose library and file format for storing scientific data
+# Automatically converted from old format: BSD - review is highly recommended.
+License: LicenseRef-Callaway-BSD
+URL: https://portal.hdfgroup.org/
+Source0: https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf%{version}.tar.gz
+Source1: h4comp
+# Fix java build
+Patch1: hdf-build.patch
+
+# For destdir/examplesdir patches
+BuildRequires: automake, libtool, gcc, gcc-c++
+BuildRequires: chrpath
+BuildRequires: flex byacc libjpeg-devel zlib-devel %{!?el6:libaec-devel}
+BuildRequires: libtirpc-devel
+BuildRequires: gcc-gfortran, gcc
+%if %{with java}
+BuildRequires: java-devel
+BuildRequires: javapackages-tools
+BuildRequires: hamcrest
+BuildRequires: junit
+BuildRequires: slf4j
+%else
+Obsoletes:     java-hdf < %{version}-%{release}
+%endif
+BuildRequires: make
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
 
 %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 
-essentially a multidimensional array of data elements, and a group is a 
-structure for organizing objects in an HDF file. Using these two basic 
-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.
+HDF4 is a general purpose library and file format for storing scientific data.
+HDF4 can store two primary objects: datasets and groups. A dataset is
+essentially a multidimensional array of data elements, and a group is a
+structure for organizing objects in an HDF4 file. Using these two basic
+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 HDF4 files according to your needs.
 
 
 %package devel
-Summary: HDF development files
-Group: Development/Libraries
+Summary: HDF4 development files
 Provides: %{name}-static = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: libjpeg-devel%{?_isa}
+Requires: libtirpc-devel%{?_isa}
+Requires: zlib-devel%{?_isa}
 
 %description devel
-HDF development headers and libraries.
+HDF4 development headers and libraries.
+
+
+%package examples
+Summary: HDF4 example source files
+BuildArch: noarch
+
+%description examples
+HDF4 example source files.
+
+
+%package libs
+Summary: HDF4 shared libraries
+
+%description libs
+HDF4 shared libraries.
+
+
+%package static
+Summary: HDF4 static libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+HDF4 static libraries.
+
+
+%if %{with java}
+%package -n java-hdf
+Summary: HDF4 java library
+Requires:  slf4j
+Obsoletes: jhdf < 3.3.1-2
+
+%description -n java-hdf
+HDF4 java library
+%endif
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .maxavailfiles
-%patch1 -p1 -b .ppc
-%patch2 -p1 -b .sparc
-%patch3 -p1 -b .s390
-%patch4 -p1 -b .arm
-%patch5 -p1 -b .declaration
-%patch6 -p1 -b .wrap
+%setup -q -n hdf4-hdf%{version}
+%patch -P 1 -p1 -b .build
+
+%if %{with java}
+# Replace jars with system versions
+# hamcrest-core is obsoleted in hamcrest-2.2
+# Junit tests are failing with junit-4.13.1
+%if 0%{?rhel} >= 9 || 0%{?fedora}
+find . ! -name junit.jar -name "*.jar" -delete
+ln -s $(build-classpath hamcrest) java/lib/hamcrest-core.jar
+%else
+find . -name "*.jar" -delete
+ln -s $(build-classpath hamcrest/core) java/lib/hamcrest-core.jar
+ln -s $(build-classpath junit) java/lib/junit.jar
+# Fix test output
+junit_ver=$(sed -n '/<version>/{s/^.*>\([0-9]\.[0-9.]*\)<.*/\1/;p;q}' /usr/share/maven-poms/junit.pom)
+sed -i -e "s/JUnit version .*/JUnit version $junit_ver/" java/test/testfiles/JUnit-*.txt
+%endif
+ln -s $(build-classpath slf4j/api) java/lib/slf4j-api-1.7.33.jar
+ln -s $(build-classpath slf4j/nop) java/lib/ext/slf4j-nop-1.7.33.jar
+ln -s $(build-classpath slf4j/simple) java/lib/ext/slf4j-simple-1.7.33.jar
+%endif
+
+find . -type f -name "*.h" -exec chmod 0644 '{}' \;
+find . -type f -name "*.c" -exec chmod 0644 '{}' \;
 
-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.s390 ./mfhdf/libsrc/config/netcdf-linux.h
+#touch -c -r ./hdf/src/hdfi.h.ppc ./hdf/src/hdfi.h
 
 
 %build
+# This should be removed once rebased to an upstream version with
+# C99 compatibility fixes (bug 2167466).
+#global build_type_safety_c 0
+
+# For destdir/examplesdir patches
+autoreconf -vif
+
 # avoid upstream compiler flags settings
 rm config/*linux-gnu
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-export FFLAGS="$RPM_OPT_FLAGS -fPIC -ffixed-line-length-none"
-%configure --disable-production --disable-netcdf \
- --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name}
 
-make
+# TODO: upstream fix
+# libmfhdf.so is link to libdf.so
+export CFLAGS="%{optflags} -std=gnu17 -I%{_usr}/include/tirpc"
+export LIBS="-ltirpc"
+%global _configure ../configure
+# Java test needs this but doesn't create it
+mkdir -p build-shared/java/lib
+cd build-shared
+# Java requires shared libraries, fortran requires static
+%configure --disable-production %{?with_java:--enable-java} --disable-netcdf \
+ --enable-shared=yes --enable-static=no --disable-fortran %{!?el6:--with-szlib} \
+ --includedir=%{_includedir}/%{name}
+%make_build
+cd -
+mkdir build-static
+cd build-static
+# Java requires shared libraries, fortran requires static
+
+# Temporary workaround for compiling on GCC-10
+%if 0%{?fedora} || 0%{?rhel} > 8
+export FCFLAGS="%{build_fflags} -fallow-argument-mismatch"
+export FFLAGS="%{build_fflags} -fallow-argument-mismatch"
+%endif
+%configure --disable-production --disable-java --disable-netcdf \
+ --enable-shared=no --enable-static=yes --enable-fortran %{!?el6:--with-szlib} \
+ --includedir=%{_includedir}/%{name}
+%make_build
+cd -
+
 # correct the timestamps based on files used to generate the header files
-touch -c -r ./mfhdf/fortran/config/netcdf-linux.inc mfhdf/fortran/netcdf.inc
 touch -c -r hdf/src/hdf.inc hdf/src/hdf.f90
 touch -c -r hdf/src/dffunc.inc hdf/src/dffunc.f90
 touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90
 # netcdf fortran include need same treatement, but they are not shipped
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+%make_install -C build-static
+%make_install -C build-shared
+chrpath --delete --keepgoing %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/%{name}/*.so.* %{buildroot}%{_libdir}/*.so.* || :
+
+#install -pm 644 README.txt release_notes/*.txt %{buildroot}%{_pkgdocdir}/
+
+rm -f %{buildroot}%{_libdir}/%{name}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
+
 #Don't conflict with netcdf
-#rm $RPM_BUILD_ROOT%{_bindir}/nc* $RPM_BUILD_ROOT%{_mandir}/man1/nc*
 for file in ncdump ncgen; do
-  mv $RPM_BUILD_ROOT%{_bindir}/$file $RPM_BUILD_ROOT%{_bindir}/h$file
+  mv %{buildroot}%{_bindir}/$file %{buildroot}%{_bindir}/h$file
   # man pages are the same than netcdf ones
-  rm $RPM_BUILD_ROOT%{_mandir}/man1/${file}.1
+  rm %{buildroot}%{_mandir}/man1/${file}.1
 done
 
-# this is done to have the same timestamp on multiarch setups
-touch -c -r README.txt $RPM_BUILD_ROOT/%{_includedir}/hdf/h4config.h
+#Fixup headers and scripts for multiarch
+%if "%{_lib}" == "lib64"
+for x in h4cc h4fc
+do
+  mv %{buildroot}%{_bindir}/${x} \
+     %{buildroot}%{_bindir}/${x}-64
+  install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x}
+done
+%else
+for x in h4cc h4fc
+do
+  mv %{buildroot}%{_bindir}/${x} \
+     %{buildroot}%{_bindir}/${x}-32
+  install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x}
+done
+%endif
 
-# Remove an autoconf conditional from the API that is unused and cause
-# the API to be different on x86 and x86_64
-pushd $RPM_BUILD_ROOT/%{_includedir}/hdf
-grep -v 'H4_SIZEOF_INTP' h4config.h > h4config.h.tmp
-touch -c -r h4config.h h4config.h.tmp
-mv h4config.h.tmp h4config.h
-popd
 
 %check
-make check
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# https://github.com/HDFGroup/hdf4/issues/473
+%ifarch ppc64le s390x
+make -j1 -C build-shared check || :
+make -j1 -C build-static check || :
+%else
+make -j1 -C build-shared check
+make -j1 -C build-static check
+%endif
 
 
 %files
-%defattr(-,root,root,0755)
-%doc COPYING MANIFEST README.txt release_notes/*.txt
+%license COPYING
+%doc README.md release_notes/*.txt
 %{_bindir}/*
-%{_mandir}/man1/*.gz
+%exclude %{_bindir}/h4?c*
+%{_libdir}/*.so.0*
 
 %files devel
-%defattr(-,root,root,0755)
+%{_bindir}/h4?c*
 %{_includedir}/%{name}/
-%{_libdir}/%{name}/
+%{_libdir}/*.so
+%{_libdir}/*.settings
+
+%files examples
+%doc HDF4Examples
+
+%files libs
+%{_libdir}/*.so.0*
+
+%files static
+%{_libdir}/*.a
+
+%if %{with java}
+%files -n java-hdf
+%{_jnidir}/hdf.jar
+%{_libdir}/%{name}/libhdf_java.so
+%endif
 
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Antonio Trande <sagitter@fedoraproject.org> - 4.3.0-3
+- Fix GCC15 builds
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Sep 30 2024 Orion Poplawski <orion@nwra.com> - 4.3.0-1
+- Update to 4.3.0
+
+* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 4.2.16.2-3
+- convert license to SPDX
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.16.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jan 30 2024 Orion Poplawski <orion@nwra.com> - 4.2.16.2-1
+- Update to 4.2.16-2
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Aug 29 2023 Florian Weimer <fweimer@redhat.com> - 4.2.15-14
+- Set build_type_safety_c to 0 (#2167466)
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jul 10 2022 Orion Poplawski <orion@nwra.com> - 4.2.15-10
+- Drop java for i686 (bz#2104047)
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2.15-9
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 29 2021 Antonio Trande <sagitter@fedoraproject.org> - 4.2.15-7
+- Fix eln builds
+
+* Wed Jul 28 2021 Antonio Trande <sagitter@fedoraproject.org> - 4.2.15-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Use bundled junit
+- Fix hamcrest symlinks in Fedora 35+
+
+* Sun May 30 2021 Orion Poplawski <orion@nwra.com> - 4.2.15-5
+- Handle junit versions better
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Merlin Mathesius <mmathesi@redhat.com> - 4.2.15-2
+- Minor conditional fix for ELN
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.2.15-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri May 01 2020 Orion Poplawski <orion@nwra.com> - 4.2.15-1
+- Update to 4.2.15
+
+* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 4.2.14-9
+- Fix string quoting for rpm >= 4.16
+
+* Sun Feb 02 2020 Antonio Trande <sagitter@fedoraproject.org> 4.2.14-8
+- Temporary workaround for compiling with GCC-10 
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.14-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov  8 2019 Orion Poplawski <orion@nwra.com> - 4.2.14-6
+- Move compile scripts to hdf-devel and allow multilib install (bz#1769326)
+- Split shared libraries into hdf-libs sub-package
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.14-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Apr 10 2019 Orion Poplawski <orion@nwra.com> - 4.2.14-4
+- Move libraries into %%{_libdir}
+
+* Tue Apr 9 2019 Orion Poplawski <orion@nwra.com> - 4.2.14-3
+- Build shared libraries
+- Enable java
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Nov 03 2018 Antonio Trande <sagitter@fedoraproject.org> 4.2.14-1
+- Release 4.2.14
+
+* Sun Oct 7 2018 Orion Poplawski <orion@nwra.com> - 4.2.13-11
+- Use LIBS instead of LDFLAGS for -ltirpc
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.13-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 22 2018 Antonio Trande <sagitter@fedoraproject.org> - 4.2.13-9
+- Add gcc BR
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.13-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Feb 5 2018 Orion Poplawski <orion@nwra.com> - 4.2.13-7
+- Make hdf-devel require libtirpc-devel
+
+* Fri Feb 02 2018 Orion Poplawski <orion@cora.nwra.com> - 4.2.13-6
+- Rebuild for gcc 8.0
+
+* Sat Jan 20 2018 Antonio Trande <sagitter@fedoraproject.org> 4.2.13-5
+- Enable szlib support
+
+* Wed Jan 17 2018 Pavel Raiskup <praiskup@redhat.com> - 4.2.13-4
+- rpc api moved from glibc to libtirpc:
+  https://fedoraproject.org/wiki/Changes/SunRPCRemoval
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 21 2017 Antonio Trande <sagitter@fedoraproject.org> 4.2.13-1
+- Update to 4.2.13
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Jan 31 2017 Orion Poplawski <orion@cora.nwra.com> 4.2.12-1
+- Update to 4.2.12
+
+* Wed May 25 2016 Orion Poplawski <orion@cora.nwra.com> 4.2.11-4
+- Cleanup spec
+- Remove .la files
+- Use %%license
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Feb 13 2015 Orion Poplawski <orion@cora.nwra.com> 4.2.11-1
+- Update to 4.2.11
+- Drop format patch applied upstream
+- Update destdir patch
+
+* Mon Sep 8 2014 Orion Poplawski <orion@cora.nwra.com> - 4.2.10-7
+- Updated patch for ppc64le support (bug #1134385)
+
+* Wed Sep 3 2014 Orion Poplawski <orion@cora.nwra.com> - 4.2.10-6
+- Add initial attempt at ppc64le support (bug #1134385)
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Jun 25 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> 4.2.10-4
+- Add AArch64 support.
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 22 2014 Jakub Čajka <jcajka@redhat.com> 4.2.10-2
+- Fixed build/tests on s390x
+- Tests enabled on ppc
+
+* Fri Feb 14 2014 Orion Poplawski <orion@cora.nwra.com> 4.2.10-1
+- Update to 4.2.10
+- Rebase arm, ppc, and s390 patches
+- Add destdir, examplesdir patches to fix installation of examples
+
+* Sat Feb 1 2014 Orion Poplawski <orion@cora.nwra.com> 4.2.9-4
+- Fix build with -Werror=format-security (bug #1037120)
+
+* Tue Aug 13 2013 Karsten Hopp <karsten@redhat.com> 4.2.9-3
+- temporarily skip checks on ppc* (#961007)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri Feb 15 2013 Orion Poplawski <orion@cora.nwra.com> 4.2.9-1
 - Update to 4.2.9
 - Add patch for some missing declarations

sources

@@ -1 +1 @@
-c268a703f334ee4987fa710a0de9b9fc  hdf-4.2.9.tar.bz2
+SHA512 (hdf4.3.0.tar.gz) = dd1c433a393d893744c29479c756331e677d4201bb0e89f64b846d6c5d9a4fcee64e99b4ed46a97741b55cf0917002f00d8fa2582db5570aa0d6eb202242a558