Bump release

Fix string quoting for rpm >= 4.16
Export FFLAGS too
2020-04-02 13:30:19 +02:00 · 2020-04-02 12:58:46 +02:00 · 2020-02-02 19:06:03 +01:00 · 2020-02-02 18:58:21 +01:00 · 2020-01-29 04:10:47 +00:00 · 2019-11-08 21:43:44 -07:00
9 changed files with 390 additions and 646 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,7 @@ hdf-4.2.5.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
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+#!/bin/bash
+
+BITS=32
+[ -d /usr/lib64 ] && BITS=64
+
+exec $0-${BITS} "$@"
--- a/hdf-avoid_syntax_error_el6.patch
+++ b/hdf-avoid_syntax_error_el6.patch
@ -0,0 +1,17 @@
+--- configure.orig.ac	2017-06-24 23:00:04.000000000 +0200
+++ configure.ac	2017-07-21 22:13:19.695919835 +0200
+@@ -264,10 +264,10 @@
+       JNIFLAGS="$JNIFLAGS -I$JNI_INCLUDE_DIR"
+     done
+     ## Find junit for testing the JNI code
+-    AX_CHECK_CLASSPATH()
+-    CLASSPATH_ENV=$H4_CLASSPATH
+-    AX_CHECK_JUNIT()
+-    AX_CHECK_JAVA_HOME
+    ## AX_CHECK_CLASSPATH()
+    ## CLASSPATH_ENV=$H4_CLASSPATH
+    ## AX_CHECK_JUNIT()
+    ## AX_CHECK_JAVA_HOME
+ 
+     AC_MSG_RESULT([yes])
+   else
--- a/hdf-build.patch
+++ b/hdf-build.patch
@ -0,0 +1,67 @@
+diff -up hdf-4.2.14/java/examples/Makefile.am.build hdf-4.2.14/java/examples/Makefile.am
+--- hdf-4.2.14/java/examples/Makefile.am.build	2018-06-26 22:42:58.000000000 -0600
+++ hdf-4.2.14/java/examples/Makefile.am	2019-04-10 20:01:42.336828053 -0600
+@@ -12,8 +12,8 @@ classes:
+ 	test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
+ 
+ pkgpath = examples
+-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
+-jarfile = jar$(PACKAGE_TARNAME)examples.jar
+hdfjarfile = $(PACKAGE_TARNAME).jar
+jarfile = $(PACKAGE_TARNAME)examples.jar
+ 
+ CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH
+ AM_JAVACFLAGS = $(H4_JAVACFLAGS) -deprecation
+diff -up hdf-4.2.14/java/src/jni/Makefile.am.build hdf-4.2.14/java/src/jni/Makefile.am
+--- hdf-4.2.14/java/src/jni/Makefile.am.build	2018-06-26 22:42:58.000000000 -0600
+++ hdf-4.2.14/java/src/jni/Makefile.am	2019-04-10 20:47:55.397873538 -0600
+@@ -14,7 +14,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src
+          -I$(top_builddir)/mfhdf/libsrc -I$(top_srcdir)/java/src/jni $(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 hdf-4.2.14/java/src/Makefile.am.build hdf-4.2.14/java/src/Makefile.am
+--- hdf-4.2.14/java/src/Makefile.am.build	2018-06-26 22:42:58.000000000 -0600
+++ hdf-4.2.14/java/src/Makefile.am	2019-04-10 20:01:42.336828053 -0600
+@@ -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.5.jar:$$CLASSPATH
+diff -up hdf-4.2.14/java/test/junit.sh.in.build hdf-4.2.14/java/test/junit.sh.in
+--- hdf-4.2.14/java/test/junit.sh.in.build	2018-06-26 22:42:58.000000000 -0600
+++ hdf-4.2.14/java/test/junit.sh.in	2019-04-10 20:01:42.337828056 -0600
+@@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
+ BLDLIBDIR="$top_builddir/java/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 hdf-4.2.14/java/test/Makefile.am.build hdf-4.2.14/java/test/Makefile.am
+--- hdf-4.2.14/java/test/Makefile.am.build	2018-06-26 22:42:58.000000000 -0600
+++ hdf-4.2.14/java/test/Makefile.am	2019-04-10 20:01:42.337828056 -0600
+@@ -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.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH
+ 
+ jarfile = jar$(PACKAGE_TARNAME)test.jar
--- a/hdf-destdir.patch
+++ b/hdf-destdir.patch
@ -1,17 +1,21 @@
-diff -up hdf-4.2.10/config/examples.am.destdir hdf-4.2.10/config/examples.am
--- hdf-4.2.10/config/examples.am.destdir	2014-02-09 19:28:50.000000000 -0700
-+++ hdf-4.2.10/config/examples.am	2014-02-14 10:02:35.039386643 -0700
-@@ -45,7 +45,7 @@ CLEANFILES=$(EXAMPLE_PROG)
+diff -up hdf-4.2.11/config/examples.am.destdir hdf-4.2.11/config/examples.am
+--- hdf-4.2.11/config/examples.am.destdir	2015-02-09 09:43:05.000000000 -0700
+++ hdf-4.2.11/config/examples.am	2015-02-13 13:24:09.008230956 -0700
+@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf
+ CLEANFILES=$(EXAMPLE_PROG)
 
 # How to create EXAMPLEDIR if it doesn't already exist
- $(EXAMPLEDIR):
-	mkdir -p $@
-+	mkdir -p $(DESTDIR)$@
+-$(EXAMPLEDIR):
+$(DESTDIR)$(EXAMPLEDIR):
+ 	mkdir -p $@
 
 # Install and uninstall rules.  We install the source files, not the
- # example programs themselves.
-@@ -57,39 +57,39 @@ uninstall-local:
- install-examples: $(EXAMPLEDIR) 
+@@ -54,42 +54,42 @@ install-data-local:
+ uninstall-local:
+ 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
+ 
+-install-examples: $(EXAMPLEDIR) 
+install-examples: $(DESTDIR)$(EXAMPLEDIR) 
 	@for f in X $(INSTALL_FILES); do                                     \
 	  if test $$f != X; then                                             \
 -	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
--- a/hdf-examplesdir.patch
+++ b/hdf-examplesdir.patch
@ -1,49 +1,49 @@
-diff -up hdf-4.2.10/hdf/examples/Makefile.am.examplesdir hdf-4.2.10/hdf/examples/Makefile.am
--- hdf-4.2.10/hdf/examples/Makefile.am.examplesdir	2014-02-09 19:28:50.000000000 -0700
-+++ hdf-4.2.10/hdf/examples/Makefile.am	2014-02-14 10:10:17.854023687 -0700
-@@ -46,8 +46,8 @@ INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh
+diff -up a/hdf/examples/Makefile.am b/hdf/examples/Makefile.am
+--- a/hdf/examples/Makefile.am	2017-01-31 14:41:51.947802481 -0700
+++ b/hdf/examples/Makefile.am	2017-01-31 14:42:34.883572782 -0700
+@@ -46,8 +46,8 @@
 INSTALL_TOP_FILES = README
 
 # Where to install example files
-EXAMPLEDIR=$(prefix)/examples/c
-EXAMPLETOPDIR=$(prefix)/examples
+-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/c
+-EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples
 +EXAMPLEDIR=$(docdir)/examples/c
 +EXAMPLETOPDIR=$(docdir)/examples
 
 # How to build C programs using h4cc
 $(EXTRA_PROG): $(H4CC)
-diff -up hdf-4.2.10/hdf/fortran/examples/Makefile.am.examplesdir hdf-4.2.10/hdf/fortran/examples/Makefile.am
--- hdf-4.2.10/hdf/fortran/examples/Makefile.am.examplesdir	2014-02-09 19:28:49.000000000 -0700
-+++ hdf-4.2.10/hdf/fortran/examples/Makefile.am	2014-02-14 10:10:30.082961395 -0700
-@@ -41,7 +41,7 @@ INSTALL_FILES= VD_read_from_vdata.f VD_r
+diff -up a/hdf/fortran/examples/Makefile.am b/hdf/fortran/examples/Makefile.am
+--- a/hdf/fortran/examples/Makefile.am	2017-01-31 14:41:51.949802471 -0700
+++ b/hdf/fortran/examples/Makefile.am	2017-01-31 14:43:07.968395906 -0700
+@@ -41,7 +41,7 @@
 INSTALL_SCRIPT_FILES = run-fortran-ex.sh
 
 # Where to install Fortran example files
-EXAMPLEDIR=$(prefix)/examples/fortran
+-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/fortran
 +EXAMPLEDIR=$(docdir)/examples/fortran
 
 # How to build Fortran programs using h4fc
 $(EXTRA_PROG): $(H4FC)
-diff -up hdf-4.2.10/mfhdf/examples/Makefile.am.examplesdir hdf-4.2.10/mfhdf/examples/Makefile.am
--- hdf-4.2.10/mfhdf/examples/Makefile.am.examplesdir	2014-02-09 19:28:45.000000000 -0700
-+++ hdf-4.2.10/mfhdf/examples/Makefile.am	2014-02-14 10:09:41.465209051 -0700
-@@ -23,7 +23,7 @@ INSTALL_FILES = SD_create_sds.c SD_write
+diff -up a/mfhdf/examples/Makefile.am b/mfhdf/examples/Makefile.am
+--- a/mfhdf/examples/Makefile.am	2017-01-31 14:41:51.950802465 -0700
+++ b/mfhdf/examples/Makefile.am	2017-01-31 14:43:23.376314066 -0700
+@@ -23,7 +23,7 @@
 	SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c        \
 	SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
 
-EXAMPLEDIR=$(prefix)/examples/c
+-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/c
 +EXAMPLEDIR=$(docdir)/examples/c
 
 # How to build programs using h4cc
 $(EXTRA_PROG): $(H4CC)
-diff -up hdf-4.2.10/mfhdf/fortran/examples/Makefile.am.examplesdir hdf-4.2.10/mfhdf/fortran/examples/Makefile.am
--- hdf-4.2.10/mfhdf/fortran/examples/Makefile.am.examplesdir	2014-02-09 19:28:44.000000000 -0700
-+++ hdf-4.2.10/mfhdf/fortran/examples/Makefile.am	2014-02-14 10:09:52.818151212 -0700
-@@ -24,7 +24,7 @@ INSTALL_FILES=SD_create_sds.f SD_write_t
+diff -up a/mfhdf/fortran/examples/Makefile.am b/mfhdf/fortran/examples/Makefile.am
+--- a/mfhdf/fortran/examples/Makefile.am	2017-01-31 14:41:51.952802455 -0700
+++ b/mfhdf/fortran/examples/Makefile.am	2017-01-31 14:43:40.206224672 -0700
+@@ -24,7 +24,7 @@
 	SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
 
 # Where to install example files
-EXAMPLEDIR=$(prefix)/examples/fortran
+-EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf4_examples/fortran
 +EXAMPLEDIR=$(docdir)/examples/fortran
 
 # How to build Fortran programs using h4fc
--- a/hdf-format.patch
+++ b/hdf-format.patch
@ -1,561 +0,0 @@
-diff -up hdf-4.2.9/hdf/util/hdf2gif.c.format hdf-4.2.9/hdf/util/hdf2gif.c
--- hdf-4.2.9/hdf/util/hdf2gif.c.format	2013-02-07 21:44:54.000000000 -0700
-+++ hdf-4.2.9/hdf/util/hdf2gif.c	2014-01-31 22:49:26.533838223 -0700
-@@ -143,7 +143,7 @@ int main(int argc , char **argv) {
- 	if(file_id == -1) {
- 		printf("Unable to open HDF file");
- 		status = HEvalue(1);
-		printf(HEstring(status));
-+		printf("%s",HEstring(status));
- 		exit(0);
- 	}
- 	
-@@ -162,7 +162,7 @@ int main(int argc , char **argv) {
- 	
- 	if ((status = GRfileinfo(gr_id , &n_images , &n_fileattributes)) == -1) {
- 		status = HEvalue(1);
-		printf(HEstring(status));
-+		printf("%s",HEstring(status));
- 		exit(0);
- 	}
- 	
-diff -up hdf-4.2.9/hdf/util/writehdf.c.format hdf-4.2.9/hdf/util/writehdf.c
--- hdf-4.2.9/hdf/util/writehdf.c.format	2013-02-07 21:44:54.000000000 -0700
-+++ hdf-4.2.9/hdf/util/writehdf.c	2014-01-31 22:38:49.331653168 -0700
-@@ -77,13 +77,13 @@ char     *GIFFileName;
- 	if(file_id == -1) {
- 		printf("Unable to create HDF file");
- 		status = HEvalue(1);
-		printf(HEstring(status));
-+		printf("%s",HEstring(status));
- 		exit(0);
- 	}
- 
- 	if ((status = Vstart(file_id)) == -1) {
- 		printf("Could not start VGroup interface\n");
-		printf(HEstring(HEvalue(1)));
-+		printf("%s",HEstring(HEvalue(1)));
- 		exit(-1);
- 	}
- 
-@@ -99,7 +99,7 @@ char     *GIFFileName;
- 		status = Vsetattr (vgroup_id, "Global Palette" , DFNT_UINT8, 3 * gifHead.TableSize , (VOIDP)gifHead.HDFPalette);
- 		if (status) {
- 			printf("Could not add global palette.\n");
-			printf(HEstring(HEvalue(1)));
-+			printf("%s",HEstring(HEvalue(1)));
- 		}
- 	}
- 	for (i = 0 ; i < CommentCount ; i++) {
-@@ -144,14 +144,14 @@ char     *GIFFileName;
- 		/* GRSetCompress */
- 		if ((status = GRsetcompress(ri_id, comp_type, &c_info)) == -1) {
- 			printf("Error occured while setting compression\n");
-			printf(HEstring(HEvalue(1)));
-+			printf("%s",HEstring(HEvalue(1)));
- 			exit(-1);
- 		}
- 
- 		/* Write the GR Image */
- 		if ((status = GRwriteimage(ri_id, start, NULL, edges, (VOIDP)gifImageDesc.Image)) == -1) {
- 			printf("Error occured while trying to write GR image\n");
-			printf(HEstring(HEvalue(1)));
-+			printf("%s",HEstring(HEvalue(1)));
- 			exit(-1);
- 		}
- 
-@@ -160,7 +160,7 @@ char     *GIFFileName;
- 
- 		if ((status = GRwritelut (pal_id , 3, DFNT_UINT8, interlace_mode, 256, (VOIDP)gifImageDesc.HDFPalette)) == -1) {
- 			printf("Could not write palette\n");
-			printf(HEstring(HEvalue(1)));
-+			printf("%s",HEstring(HEvalue(1)));
- 			exit(-1);
- 		}
- 		
-@@ -169,7 +169,7 @@ char     *GIFFileName;
- 		
- 		if ((status = GRendaccess(ri_id)) == -1) {
- 			printf("Could not terminate GR access\n");
-			printf(HEstring(HEvalue(1)));
-+			printf("%s",HEstring(HEvalue(1)));
- 			exit(-1);
- 		}
- 
-@@ -178,7 +178,7 @@ char     *GIFFileName;
- 		/* Adding GR to vgroup */
- 		if((status = Vaddtagref(vgroup_id,(int32)1965,gr_ref))==-1) {
- 			printf("Could not add tag to Vgroup");
-			printf(HEstring(HEvalue(1)));
-+			printf("%s",HEstring(HEvalue(1)));
- 		}
- 
- 		
-@@ -187,28 +187,28 @@ char     *GIFFileName;
- 	/* Terminate GR access */
- 	if ((status = GRend (gr_id))==-1) {
- 		printf("Could not end GR access\n");
-		printf(HEstring(HEvalue(1)));
-+		printf("%s",HEstring(HEvalue(1)));
- 		printf("Trying to continue (file may be corrupt)...\n");
- 	}
- 	
- 	/* Terminate access to the VGroup */
- 	if ((status = Vdetach(vgroup_id))==-1) {
- 		printf("Could not detach Vgroup\n");
-		printf(HEstring(HEvalue(1)));
-+		printf("%s",HEstring(HEvalue(1)));
- 		printf("Trying to continure (file may be corrupt)...\n");
- 	}
- 
- 	/* Terminate access to the V interface */
- 	if ((status = Vend(file_id))==-1) {
- 		printf("Could not end VGroup access\n");
-		printf(HEstring(HEvalue(1)));
-+		printf("%s",HEstring(HEvalue(1)));
- 		printf("Trying to continure (file may be corrupt)... \n");
- 	}
- 
- 	/* Close the HDF file */
- 	if ((status = Hclose (file_id))==-1) {
- 		printf("Could not close HDF file. Fatal Error");
-		printf(HEstring(HEvalue(1)));
-+		printf("%s",HEstring(HEvalue(1)));
- 		return(-1);
- 	}
- 	return(0);
-diff -up hdf-4.2.9/mfhdf/hdfimport/hdfimport.c.format hdf-4.2.9/mfhdf/hdfimport/hdfimport.c
--- hdf-4.2.9/mfhdf/hdfimport/hdfimport.c.format	2013-02-07 21:44:45.000000000 -0700
-+++ hdf-4.2.9/mfhdf/hdfimport/hdfimport.c	2014-02-01 08:54:54.512707178 -0700
-@@ -628,7 +628,7 @@ main(int argc, char *argv[])
- 	      break;
- 	    case ERR:   /* command syntax error */
- 	    default:
-	      (void) fprintf(stderr, err2);
-+	      (void) fprintf(stderr, "%s", err2);
- 	      usage(argv[0]);
- 	      goto err;
-             }
-@@ -639,7 +639,7 @@ main(int argc, char *argv[])
-      */
-     if (!outfile_named)
-       {
-          (void) fprintf(stderr, err3);
-+          (void) fprintf(stderr, "%s", err3);
-           usage(argv[0]);
-           goto err;
-       }
-@@ -656,7 +656,7 @@ main(int argc, char *argv[])
-     return(0);
- 
-   err:
-    (void) fprintf(stderr, err4);
-+    (void) fprintf(stderr, "%s", err4);
-     return(1);
- }
- 
-@@ -960,7 +960,7 @@ gdimen(struct infilesformat infile_info,
- 	sds_name = (char *)HDmalloc(name_len+1);
- 	if (sds_name == NULL)
-           {
-            (void) fprintf(stderr, err6);
-+            (void) fprintf(stderr, "%s", err6);
-             goto err;
-           }
- 
-@@ -2227,7 +2227,7 @@ indexes(float32 *scale, int dim, int *id
-      */
-     if ((midpt = (float32 *) HDmalloc((size_t) dim * sizeof(float32))) == NULL)
-       {
-          (void) fprintf(stderr, err1);
-+          (void) fprintf(stderr, "%s", err1);
-           goto err;
-       }
-     for (i = 0; i < dim - 1; i++)
-@@ -2329,13 +2329,13 @@ interp(struct Input *in, struct Raster *
-      */
-     if ((hratio = (float32 *) HDmalloc((size_t) im->hres * sizeof(float32))) == NULL)
-       {
-          (void) fprintf(stderr, err1);
-+          (void) fprintf(stderr, "%s", err1);
-           goto err;
-       }
-     if ((vratio = (float32 *) HDmalloc((unsigned int) im->vres *
-                                          sizeof(float32))) == NULL)
-       {
-          (void) fprintf(stderr, err1);
-+          (void) fprintf(stderr, "%s", err1);
-           goto err;
-       }
-     if (in->rank == 3)
-@@ -2343,7 +2343,7 @@ interp(struct Input *in, struct Raster *
-           if ((dratio = (float32 *) HDmalloc((unsigned int) im->dres *
-                                                sizeof(float32))) == NULL)
-             {
-                (void) fprintf(stderr, err1);
-+                (void) fprintf(stderr, "%s", err1);
-                 goto err;
-             }
-       }
-@@ -2355,13 +2355,13 @@ interp(struct Input *in, struct Raster *
-     if ((hinc = (int *) HDmalloc((unsigned int) im->hres *
-                                    sizeof(int))) == NULL)
-       {
-          (void) fprintf(stderr, err1);
-+          (void) fprintf(stderr, "%s", err1);
-           goto err;
-       }
-     if ((voff = (int *) HDmalloc((unsigned int) (im->vres + 1) *
-                                    sizeof(int))) == NULL)
-       {
-          (void) fprintf(stderr, err1);
-+          (void) fprintf(stderr, "%s", err1);
-           goto err;
-       }
-     if (in->rank == 3)
-@@ -2369,7 +2369,7 @@ interp(struct Input *in, struct Raster *
-           if ((doff = (int *) HDmalloc((unsigned int) (im->dres + 1) *
-                                          sizeof(int))) == NULL)
-             {
-                (void) fprintf(stderr, err1);
-+                (void) fprintf(stderr, "%s", err1);
-                 goto err;
-             }
-       }
-@@ -2640,7 +2640,7 @@ palette(char *palfile)
-      */
-     if (DFR8setpalette(pal))
-       {
-          (void) fprintf(stderr, err3);
-+          (void) fprintf(stderr, "%s", err3);
-           goto err;
-       }
- 
-@@ -2681,7 +2681,7 @@ pixrep(struct Input *in, struct Raster *
-      */
-     if ((hidx = (int *) HDmalloc((unsigned int) (im->hres + 1) * sizeof(int))) == NULL)
-       {
-          (void) fprintf(stderr, err1);
-+          (void) fprintf(stderr, "%s", err1);
-           goto err;
-       }
- 
-@@ -2694,7 +2694,7 @@ pixrep(struct Input *in, struct Raster *
-     if ((vidx = (int *) HDmalloc((unsigned int) (im->vres + 1) *
-                                    sizeof(int))) == NULL)
-       {
-          (void) fprintf(stderr, err1);
-+          (void) fprintf(stderr, "%s", err1);
-           goto err;
-       }
- 
-@@ -2711,7 +2711,7 @@ pixrep(struct Input *in, struct Raster *
-           if ((didx = (int *) HDmalloc((unsigned int) (im->dres + 1) *
-                                          sizeof(int))) == NULL)
-             {
-                (void) fprintf(stderr, err1);
-+                (void) fprintf(stderr, "%s", err1);
-                 goto err;
-             }
- 
-@@ -2725,7 +2725,7 @@ pixrep(struct Input *in, struct Raster *
-     if ((pix = (unsigned char *) HDmalloc((unsigned int) (in->dims[0] + 1))) ==
-         NULL)
-       {
-          (void) fprintf(stderr, err1);
-+          (void) fprintf(stderr, "%s", err1);
-           goto err;
-       }
-     for (k = 0, odidx = didx[0] - 1; k < im->dres; k++)
-@@ -2842,35 +2842,35 @@ alloc_data(VOIDP *data, int32 len, int o
- 	case 5: /* NO_NE */
- 	    if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(float32))) == NULL)
- 	      {
-		(void) fprintf(stderr, alloc_err);
-+		(void) fprintf(stderr, "%s", alloc_err);
- 		return FAIL;
- 	      }
- 	    break;
- 	case 1: /* 64-bit float */
- 	    if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(float64))) == NULL)
- 	      {
-		(void) fprintf(stderr, alloc_err);
-+		(void) fprintf(stderr, "%s", alloc_err);
- 		return FAIL;
- 	      }
- 	    break;
- 	case 2: /* 32-bit integer */
- 	    if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int32))) == NULL)
- 	      {
-		(void) fprintf(stderr, alloc_err);
-+		(void) fprintf(stderr, "%s", alloc_err);
- 		return FAIL;
- 	      }
- 	    break;
- 	case 3: /* 16-bit integer */
- 	    if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int16))) == NULL)
- 	      {
-		(void) fprintf(stderr, alloc_err);
-+		(void) fprintf(stderr, "%s", alloc_err);
- 		return FAIL;
- 	      }
- 	    break;
- 	case 4: /* 8-bit integer */
- 	    if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int8))) == NULL)
- 	      {
-		(void) fprintf(stderr, alloc_err);
-+		(void) fprintf(stderr, "%s", alloc_err);
- 		return FAIL;
- 	      }
- 	    break;
-@@ -2901,7 +2901,7 @@ write_SDS(int32 sds_id, struct Input *in
- 	start[1] = 0;
- 	if (SDwritedata(sds_id, start, NULL, edges, (VOIDP)in->data) != 0)
- 	  {
-	    (void) fprintf(stderr, write_err);
-+	    (void) fprintf(stderr, "%s", write_err);
- 	    return FAIL;
- 	  }
-       }
-@@ -2916,7 +2916,7 @@ write_SDS(int32 sds_id, struct Input *in
- 	start[2] = 0;
- 	if (SDwritedata(sds_id, start, NULL, edges, (VOIDP)in->data) != 0)
- 	  {
-	    (void) fprintf(stderr, write_err);
-+	    (void) fprintf(stderr, "%s", write_err);
- 	    return FAIL;
- 	  }
-       }
-@@ -3163,7 +3163,7 @@ process(struct Options *opt)
- 			/* set range */
- 			if (SDsetrange(sds_id, &in.max, &in.min)!=0)
- 			  {
-			    (void) fprintf(stderr, err5a);
-+			    (void) fprintf(stderr, "%s", err5a);
- 			    goto err;
- 			  }	
- 		    
-@@ -3191,7 +3191,7 @@ process(struct Options *opt)
- 			/* set range */
- 			if (SDsetrange(sds_id, &in.fp64s.max, &in.fp64s.min)!=0)
- 			  {
-			    (void) fprintf(stderr, err5a);
-+			    (void) fprintf(stderr, "%s", err5a);
- 			    goto err;
- 			  }	
- 		    
-@@ -3220,7 +3220,7 @@ process(struct Options *opt)
- 			/* set range */
- 			if (SDsetrange(sds_id, &in.in32s.max, &in.in32s.min)!=0)
- 			  {
-			    (void) fprintf(stderr, err5a);
-+			    (void) fprintf(stderr, "%s", err5a);
- 			    goto err;
- 			  }	
- 		    
-@@ -3248,7 +3248,7 @@ process(struct Options *opt)
- 			/* set range */
- 			if (SDsetrange(sds_id, &in.in16s.max, &in.in16s.min)!=0)
- 			  {
-			    (void) fprintf(stderr, err5a);
-+			    (void) fprintf(stderr, "%s", err5a);
- 			    goto err;
- 			  }	
- 		    
-@@ -3276,7 +3276,7 @@ process(struct Options *opt)
- 			/* set range */
- 			if (SDsetrange(sds_id, &in.in8s.max, &in.in8s.min)!=0)
- 			  {
-			    (void) fprintf(stderr, err5a);
-+			    (void) fprintf(stderr, "%s", err5a);
- 			    goto err;
- 			  }	
- 		    
-@@ -3296,7 +3296,7 @@ process(struct Options *opt)
- 	    /* close data set */
- 	    if (SDendaccess(sds_id) == FAIL )
- 	      {
-		(void) fprintf(stderr, err6a);
-+		(void) fprintf(stderr, "%s", err6a);
- 		goto err;
- 	      }
- 
-@@ -3322,7 +3322,7 @@ process(struct Options *opt)
-                 im.hres = (opt->hres == 0) ? in.dims[0] : opt->hres;
-                 if ((im.hres < in.dims[0]) && (opt->ctm == EXPAND))
-                   {
-                      (void) fprintf(stderr, err3a);
-+                      (void) fprintf(stderr, "%s", err3a);
-                       (void) fprintf(stderr, err3b, "Horiz.");
-                       (void) fprintf(stderr, err3c, "horiz.");
-                       (void) fprintf(stderr, err3d, in.dims[0]);
-@@ -3332,7 +3332,7 @@ process(struct Options *opt)
-                 im.vres = (opt->vres == 0) ? in.dims[1] : opt->vres;
-                 if ((im.vres < in.dims[1]) && (opt->ctm == EXPAND))
-                   {
-                      (void) fprintf(stderr, err3a);
-+                      (void) fprintf(stderr, "%s", err3a);
-                       (void) fprintf(stderr, err3b, "Vert.");
-                       (void) fprintf(stderr, err3c, "vert.");
-                       (void) fprintf(stderr, err3d, in.dims[1]);
-@@ -3347,7 +3347,7 @@ process(struct Options *opt)
-                       if ((im.dres < in.dims[2]) &&
-                           (opt->ctm == EXPAND))
-                         {
-                            (void) fprintf(stderr, err3a);
-+                            (void) fprintf(stderr, "%s", err3a);
-                             (void) fprintf(stderr, err3b, "Depth");
-                             (void) fprintf(stderr, err3c, "depth");
-                             (void) fprintf(stderr, err3d,
-@@ -3359,7 +3359,7 @@ process(struct Options *opt)
-                 len = im.hres * im.vres * im.dres;
-                 if ((im.image = (unsigned char *) HDmalloc((unsigned int) len)) == NULL)
-                   {
-                      (void) fprintf(stderr, err2);
-+                      (void) fprintf(stderr, "%s", err2);
-                       goto err;
-                   }
- 
-@@ -3389,7 +3389,7 @@ process(struct Options *opt)
-                       if (DFR8addimage(opt->outfile, ip, im.hres,
-                                        im.vres, DFTAG_RLE))
-                         {
-                            (void) fprintf(stderr, err4);
-+                            (void) fprintf(stderr, "%s", err4);
-                             goto err;
-                         }
-                   }
-@@ -3430,7 +3430,7 @@ process(struct Options *opt)
-     /* close the output file */
-     if (SDend (sd_id) != 0)
-       {
-	(void) fprintf(stderr, err6);
-+	(void) fprintf(stderr, "%s", err6);
- 	goto err;
-       }
- 	
-@@ -3519,13 +3519,13 @@ static int init_scales(struct Input * in
-       if ((in->hscale = (float32 *) HDmalloc((size_t)
- 					     (in->dims[0] + 1) * sizeof(float32))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if ((in->vscale = (float32 *) HDmalloc((size_t)
- 					     (in->dims[1] + 1) * sizeof(float32))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if (in->rank == 3)
-@@ -3533,7 +3533,7 @@ static int init_scales(struct Input * in
- 	  if ((in->dscale = (float32 *) HDmalloc((size_t)
- 						 (in->dims[2] + 1) * sizeof(float32))) == NULL)
- 	    {
-	      (void) fprintf(stderr, err1);
-+	      (void) fprintf(stderr, "%s", err1);
- 	      goto err;
- 	    }
- 	}
-@@ -3544,13 +3544,13 @@ static int init_scales(struct Input * in
-       if ((in->fp64s.hscale = (float64 *) HDmalloc((size_t)
- 						   (in->dims[0] + 1) * sizeof(float64))) == NULL)
- 	{
-	    (void) fprintf(stderr, err1);
-+	    (void) fprintf(stderr, "%s", err1);
- 	    goto err;
- 	}
-       if ((in->fp64s.vscale = (float64 *) HDmalloc((size_t)
- 						   (in->dims[1] + 1) * sizeof(float64))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if (in->rank == 3)
-@@ -3558,7 +3558,7 @@ static int init_scales(struct Input * in
- 	  if ((in->fp64s.dscale = (float64 *) HDmalloc((size_t)
- 						  (in->dims[2] + 1) * sizeof(float64))) == NULL)
- 	    {
-	      (void) fprintf(stderr, err1);
-+	      (void) fprintf(stderr, "%s", err1);
- 	      goto err;
- 	    }
- 	}
-@@ -3567,13 +3567,13 @@ static int init_scales(struct Input * in
-       if ((in->in32s.hscale = (int32 *) HDmalloc((size_t)
- 						 (in->dims[0] + 1) * sizeof(int32))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if ((in->in32s.vscale = (int32 *) HDmalloc((size_t)
- 						 (in->dims[1] + 1) * sizeof(int32))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if (in->rank == 3)
-@@ -3581,7 +3581,7 @@ static int init_scales(struct Input * in
- 	  if ((in->in32s.dscale = (int32 *) HDmalloc((size_t)
-                              (in->dims[2] + 1) * sizeof(int32))) == NULL)
- 	    {
-	      (void) fprintf(stderr, err1);
-+	      (void) fprintf(stderr, "%s", err1);
- 	      goto err;
- 	    }
- 	}
-@@ -3591,13 +3591,13 @@ static int init_scales(struct Input * in
-       if ((in->in16s.hscale = (int16 *) HDmalloc((size_t)
- 						 (in->dims[0] + 1) * sizeof(int16))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if ((in->in16s.vscale = (int16 *) HDmalloc((size_t)
- 						 (in->dims[1] + 1) * sizeof(int16))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if (in->rank == 3)
-@@ -3605,7 +3605,7 @@ static int init_scales(struct Input * in
- 	  if ((in->in16s.dscale = (int16 *) HDmalloc((size_t)
- 						     (in->dims[2] + 1) * sizeof(int16))) == NULL)
- 	    {
-	      (void) fprintf(stderr, err1);
-+	      (void) fprintf(stderr, "%s", err1);
- 	      goto err;
- 	    }
- 	}
-@@ -3615,13 +3615,13 @@ static int init_scales(struct Input * in
-       if ((in->in8s.hscale = (int8 *) HDmalloc((size_t)
- 					       (in->dims[0] + 1) * sizeof(int8))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if ((in->in8s.vscale = (int8 *) HDmalloc((size_t)
-                              (in->dims[1] + 1) * sizeof(int8))) == NULL)
- 	{
-	  (void) fprintf(stderr, err1);
-+	  (void) fprintf(stderr, "%s", err1);
- 	  goto err;
- 	}
-       if (in->rank == 3)
-@@ -3629,7 +3629,7 @@ static int init_scales(struct Input * in
- 	  if ((in->in8s.dscale = (int8 *) HDmalloc((size_t)
- 						   (in->dims[2] + 1) * sizeof(int8))) == NULL)
- 	    {
-	      (void) fprintf(stderr, err1);
-+	      (void) fprintf(stderr, "%s", err1);
- 	      goto err;
- 	    }
- 	}
--- a/hdf.spec
+++ b/hdf.spec
@ -1,11 +1,15 @@
+%if 0%{?rhel} && 0%{?rhel} < 7
+%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
+%endif
+
 Name: hdf
-Version: 4.2.10
-Release: 7%{?dist}
+Version: 4.2.14
+Release: 9%{?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
+URL: https://portal.hdfgroup.org/
+Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2
+Source1: h4comp
 Patch0: hdf-4.2.5-maxavailfiles.patch
 Patch1: hdf-ppc.patch
 Patch2: hdf-4.2.4-sparc.patch
@ -15,49 +19,82 @@ Patch4: hdf-arm.patch
 Patch5: hdf-destdir.patch
 # Install examples into the right location
 Patch6: hdf-examplesdir.patch
-# Fix build with -Werror=format-security
-# https://bugzilla.redhat.com/show_bug.cgi?id=1037120
-Patch7: hdf-format.patch
 # Add AArch64 definitions
 Patch8: hdf-4.2.10-aarch64.patch
 # ppc64le support
 # https://bugzilla.redhat.com/show_bug.cgi?id=1134385
 Patch9: hdf-ppc64le.patch

-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix syntax error on epel6 builds
+# Use only if java is disabled
+Patch10: hdf-avoid_syntax_error_el6.patch
+
+# Fix java build
+Patch11: hdf-build.patch
+
 # For destdir/examplesdir patches
-BuildRequires: automake libtool
-BuildRequires: flex byacc libjpeg-devel zlib-devel
-%if "%{?dist}" != ".el4"
-BuildRequires: gcc-gfortran
-%else
-BuildRequires: gcc-g77
-%endif
+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
+BuildRequires: java-devel
+BuildRequires: javapackages-tools
+BuildRequires: hamcrest
+BuildRequires: junit
+BuildRequires: slf4j
+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 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.
+
+
+%package -n java-hdf
+Summary: HDF4 java library
+Requires:  slf4j
+Obsoletes: jhdf < 3.3.1-2
+
+%description -n java-hdf
+HDF4 java library


 %prep
 %setup -q
+
 %patch0 -p1 -b .maxavailfiles
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .sparc
@ -65,26 +102,72 @@ HDF development headers and libraries.
 %patch4 -p1 -b .arm
 %patch5 -p1 -b .destdir
 %patch6 -p1 -b .examplesdir
-%patch7 -p1 -b .format
 %patch8 -p1 -b .aarch64
 %patch9 -p1 -b .ppc64le
+%patch11 -p1 -b .build
+
+# Replace jars with system versions
+find -name \*.jar -delete
+ln -s %{_javadir}/hamcrest/core.jar java/lib/hamcrest-core.jar
+ln -s %{_javadir}/junit.jar java/lib/junit.jar
+ln -s %{_javadir}/slf4j/api.jar java/lib/slf4j-api-1.7.5.jar
+ln -s %{_javadir}/slf4j/nop.jar java/lib/ext/slf4j-nop-1.7.5.jar
+ln -s %{_javadir}/slf4j/simple.jar java/lib/ext/slf4j-simple-1.7.5.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
+
+## Fix syntax error bacause 'CLASSPATH_ENV=$H4_CLASSPATH' line on epel6 builds
+# Use only if java is disabled
+%if 0%{?rhel} && 0%{?rhel} < 7
+%patch10 -p0
+%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


 %build
+
 # 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} -I%{_includedir}/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 --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%{?fedora} > 31
+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 hdf/src/hdf.inc hdf/src/hdf.f90
 touch -c -r hdf/src/dffunc.inc hdf/src/dffunc.f90
@ -93,51 +176,175 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90


 %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.* || :
+
+install -pm 644 MANIFEST 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
+touch -c -r README.txt %{buildroot}%{_includedir}/hdf/h4config.h

 # 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
+pushd %{buildroot}%{_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

+#Fixup headers and scripts for multiarch
+%if "%{_lib}" == "lib64"
+#sed -i -e s/H5pubconf.h/H5pubconf-64.h/ %{buildroot}%{_includedir}/H5public.h
+#mv %{buildroot}%{_includedir}/H5pubconf.h \
+   #%{buildroot}%{_includedir}/H5pubconf-64.h
+for x in h4cc h4fc
+do
+  mv %{buildroot}%{_bindir}/${x} \
+     %{buildroot}%{_bindir}/${x}-64
+  install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x}
+done
+%else
+#sed -i -e s/H5pubconf.h/H5pubconf-32.h/ %{buildroot}%{_includedir}/H5public.h
+#mv %{buildroot}%{_includedir}/H5pubconf.h \
+   #%{buildroot}%{_includedir}/H5pubconf-32.h
+for x in h4cc h4fc
+do
+  mv %{buildroot}%{_bindir}/${x} \
+     %{buildroot}%{_bindir}/${x}-32
+  install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/${x}
+done
+%endif
+

 %check
-make check
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make -j1 -C build-shared check
+make -j1 -C build-static check


 %files
-%defattr(-,root,root,0755)
-%doc COPYING MANIFEST README.txt release_notes/*.txt
-%exclude %{_defaultdocdir}/%{name}/examples
+%license COPYING
+%{_pkgdocdir}/
+%exclude %{_pkgdocdir}/examples
 %{_bindir}/*
+%exclude %{_bindir}/h4?c*
+%{_libdir}/*.so.0*
 %{_mandir}/man1/*.gz

 %files devel
-%defattr(-,root,root,0755)
+%{_bindir}/h4?c*
 %{_includedir}/%{name}/
-%{_libdir}/%{name}/
-%{_defaultdocdir}/%{name}/examples
+%{_libdir}/*.so
+%{_libdir}/*.settings
+%{_pkgdocdir}/examples/
+
+%files libs
+%{_libdir}/*.so.0*
+
+%files static
+%{_libdir}/*.a
+
+%files -n java-hdf
+%{_jnidir}/hdf.jar
+%{_libdir}/%{name}/libhdf_java.so


 %changelog
+* 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)

--- a/2
+++ b/2
@ -1 +1 @@
-bf26b3caaf3c0090965c8995578375bd  hdf-4.2.10.tar.bz2
+SHA512 (hdf-4.2.14.tar.bz2) = 5689525e18bfc6be205a0a21cded68d66630020c9a1445ce5afae41d58246e26ed9ba349da1bb197c31557aba127f51a2b697a868ec7e2747ac6153858171718
Author	SHA1	Message	Date
Björn Esser	c0de79838c	Bump release	2020-04-02 13:30:19 +02:00
Björn Esser	018885023d	Fix string quoting for rpm >= 4.16	2020-04-02 12:58:46 +02:00
sagitter	c711f74cfd	Export FFLAGS too	2020-02-02 19:06:03 +01:00
sagitter	4a8a1b17e2	Temporary workaround for compiling with GCC-10	2020-02-02 18:58:21 +01:00
Fedora Release Engineering	6151ec0d1c	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-01-29 04:10:47 +00:00
Orion Poplawski	63e06769d6	Move compile scripts to hdf-devel and allow multilib install (bz#1769326) Split shared libraries into hdf-libs sub-package	2019-11-08 21:43:44 -07:00
Fedora Release Engineering	3a6fc8f089	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-25 08:20:48 +00:00
Orion Poplawski	26c3da695e	Move libraries into %{_libdir}	2019-04-10 20:53:19 -06:00
Orion Poplawski	48393863d3	Update to 4.2.14 Build shared libraries Enable java	2019-04-09 22:20:33 -06:00
Fedora Release Engineering	94fa2edf7d	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-02-01 02:10:11 +00:00
Igor Gnatenko	d1c9c8e199	Fix RHEL conditions 0%{?rhel} on Fedora expands to 0 which makes condition 0 < 7 true. You don't want that. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2019-01-28 08:23:44 +01:00
sagitter	17f9b88dac	Release 4.2.14	2018-11-06 12:55:09 +01:00
Orion Poplawski	5a3082c485	Use LIBS instead of LDFLAGS for -ltirpc	2018-10-07 12:09:16 -06:00
sagitter	8174dd8556	Add gcc gcc-c++ BR	2018-07-20 11:23:51 +02:00
Fedora Release Engineering	9038f99b94	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-07-13 04:54:31 +00:00
sagitter	4c62c88afb	Add gcc BR	2018-02-22 18:17:37 +01:00
Fedora Release Engineering	d02b717335	- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-02-07 16:10:29 +00:00
Orion Poplawski	e5ad736e30	Make hdf-devel require libtirpc-devel	2018-02-05 10:23:55 -07:00
Orion Poplawski	7fdff1deaf	Rebuild for gcc 8.0	2018-02-02 08:33:04 -07:00
sagitter	63668bb95e	Enable szlib support	2018-01-21 14:20:46 +01:00
Pavel Raiskup	55d0b25462	sunrpc code moved from glibc to libtirpc Per https://fedoraproject.org/wiki/Changes/SunRPCRemoval Resolves: rhbz#1535245 Version: 4.2.13-4	2018-01-17 07:50:01 +01:00
Fedora Release Engineering	fff01b7f2c	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild	2017-08-02 23:24:36 +00:00
Fedora Release Engineering	f075f55b81	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild	2017-07-26 12:35:27 +00:00
sagitter	d734a5fec0	Update to 4.2.13	2017-07-21 22:27:53 +02:00
Fedora Release Engineering	60421e559c	- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild	2017-02-10 12:35:10 +00:00
Orion Poplawski	2e6c8ec1ab	Update to 4.2.12	2017-01-31 15:36:17 -07:00
Orion Poplawski	76238697af	Cleanup spec - Remove .la files - Use %license	2016-05-25 21:45:53 -06:00
Dennis Gilmore	5afb49ca43	- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild	2016-02-03 23:44:25 +00:00
Orion Poplawski	1fbb00e2b1	Drop %defattr()	2016-01-25 18:44:54 -07:00
Dennis Gilmore	475dc4862f	- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild	2015-06-17 10:21:18 +00:00
Orion Poplawski	ee88e568b8	Update to 4.2.11 - Drop format patch applied upstream - Update destdir patch	2015-02-13 14:51:38 -07:00