Compare commits
6 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4b5dd59b12 | ||
|
7df79300fe | ||
|
|
de8fc8291f | ||
|
aa2f244f88 | ||
|
0acf39f8dc | ||
|
|
5104f9c534 |
8 changed files with 53 additions and 264 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -10,3 +10,4 @@ hdf-4.2.5.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
|
||||
|
|
|
|||
|
|
@ -1,22 +1,8 @@
|
|||
diff -up hdf-4.2.16-2/java/examples/Makefile.am.build hdf-4.2.16-2/java/examples/Makefile.am
|
||||
--- hdf-4.2.16-2/java/examples/Makefile.am.build 2024-01-30 16:47:54.995965404 -0700
|
||||
+++ hdf-4.2.16-2/java/examples/Makefile.am 2024-01-30 16:49:41.485107185 -0700
|
||||
@@ -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.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
|
||||
AM_JAVACFLAGS = $(H4_JAVACFLAGS) -deprecation
|
||||
diff -up hdf-4.2.16-2/java/src/jni/Makefile.am.build hdf-4.2.16-2/java/src/jni/Makefile.am
|
||||
--- hdf-4.2.16-2/java/src/jni/Makefile.am.build 2023-03-02 12:23:25.000000000 -0700
|
||||
+++ hdf-4.2.16-2/java/src/jni/Makefile.am 2024-01-30 16:47:54.995965404 -0700
|
||||
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) $(XDRINC)
|
||||
$(JNIFLAGS)
|
||||
|
||||
# This is our main target
|
||||
-lib_LTLIBRARIES=libhdf_java.la
|
||||
|
|
@ -27,9 +13,9 @@ diff -up hdf-4.2.16-2/java/src/jni/Makefile.am.build hdf-4.2.16-2/java/src/jni/M
|
|||
|
||||
# Source files for the library
|
||||
libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \
|
||||
diff -up hdf-4.2.16-2/java/src/Makefile.am.build hdf-4.2.16-2/java/src/Makefile.am
|
||||
--- hdf-4.2.16-2/java/src/Makefile.am.build 2024-01-30 16:47:54.995965404 -0700
|
||||
+++ hdf-4.2.16-2/java/src/Makefile.am 2024-01-30 16:48:41.708702534 -0700
|
||||
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)
|
||||
|
|
@ -41,9 +27,9 @@ diff -up hdf-4.2.16-2/java/src/Makefile.am.build hdf-4.2.16-2/java/src/Makefile.
|
|||
|
||||
pkgpath = hdf/hdflib
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH
|
||||
diff -up hdf-4.2.16-2/java/test/junit.sh.in.build hdf-4.2.16-2/java/test/junit.sh.in
|
||||
--- hdf-4.2.16-2/java/test/junit.sh.in.build 2023-01-17 09:25:33.000000000 -0700
|
||||
+++ hdf-4.2.16-2/java/test/junit.sh.in 2024-01-30 16:47:54.995965404 -0700
|
||||
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="."
|
||||
|
|
@ -53,9 +39,9 @@ diff -up hdf-4.2.16-2/java/test/junit.sh.in.build hdf-4.2.16-2/java/test/junit.s
|
|||
TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
|
||||
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
||||
|
||||
diff -up hdf-4.2.16-2/java/test/Makefile.am.build hdf-4.2.16-2/java/test/Makefile.am
|
||||
--- hdf-4.2.16-2/java/test/Makefile.am.build 2024-01-30 16:47:54.996965415 -0700
|
||||
+++ hdf-4.2.16-2/java/test/Makefile.am 2024-01-30 16:49:10.596467674 -0700
|
||||
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)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
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):
|
||||
+$(DESTDIR)$(EXAMPLEDIR):
|
||||
mkdir -p $@
|
||||
|
||||
# Install and uninstall rules. We install the source files, not the
|
||||
@@ -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); \
|
||||
- chmod a-x $(EXAMPLEDIR)/$$f; \
|
||||
+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
|
||||
+ chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f; \
|
||||
fi; \
|
||||
done
|
||||
@for f in X $(INSTALL_SCRIPT_FILES); do \
|
||||
if test $$f != X; then \
|
||||
- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \
|
||||
+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1); \
|
||||
fi; \
|
||||
done
|
||||
@for f in X $(INSTALL_TOP_FILES); do \
|
||||
if test $$f != X; then \
|
||||
- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
|
||||
- chmod a-x $(EXAMPLETOPDIR)/$$f; \
|
||||
+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
|
||||
+ chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f; \
|
||||
fi; \
|
||||
done
|
||||
@for f in X $(INSTALL_TOP_SCRIPT_FILES); do \
|
||||
if test $$f != X; then \
|
||||
- (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
|
||||
+ (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
|
||||
fi; \
|
||||
done
|
||||
|
||||
uninstall-examples:
|
||||
- @if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then \
|
||||
- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \
|
||||
+ @if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \
|
||||
+ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES); \
|
||||
fi
|
||||
- @if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then \
|
||||
- set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES); \
|
||||
+ @if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then \
|
||||
+ set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES); \
|
||||
fi
|
||||
- @if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then \
|
||||
- set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES); \
|
||||
+ @if test -n "$(INSTALL_TOP_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then \
|
||||
+ set -x; cd $$(DESTDIR)(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES); \
|
||||
fi
|
||||
- @if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then \
|
||||
- set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES); \
|
||||
+ @if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then \
|
||||
+ set -x; cd $(DESTDIR)$(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES); \
|
||||
fi
|
||||
|
||||
installcheck-local:
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
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=${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 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=${DESTDIR}$(exec_prefix)/share/hdf4_examples/fortran
|
||||
+EXAMPLEDIR=$(docdir)/examples/fortran
|
||||
|
||||
# How to build Fortran programs using h4fc
|
||||
$(EXTRA_PROG): $(H4FC)
|
||||
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=${DESTDIR}$(exec_prefix)/share/hdf4_examples/c
|
||||
+EXAMPLEDIR=$(docdir)/examples/c
|
||||
|
||||
# How to build programs using h4cc
|
||||
$(EXTRA_PROG): $(H4CC)
|
||||
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=${DESTDIR}$(exec_prefix)/share/hdf4_examples/fortran
|
||||
+EXAMPLEDIR=$(docdir)/examples/fortran
|
||||
|
||||
# How to build Fortran programs using h4fc
|
||||
$(EXTRA_PROG): $(H4FC)
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
diff -up hdf-4.2.15/hdf/src/hconv.h.ppc64le hdf-4.2.15/hdf/src/hconv.h
|
||||
--- hdf-4.2.15/hdf/src/hconv.h.ppc64le 2020-04-30 21:25:25.183973672 -0600
|
||||
+++ hdf-4.2.15/hdf/src/hconv.h 2020-04-30 21:25:25.191973677 -0600
|
||||
@@ -59,7 +59,7 @@
|
||||
/* CONSTANT DEFINITIONS */
|
||||
/*****************************************************************************/
|
||||
/* Generally Big-Endian machines */
|
||||
-#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__)
|
||||
+#if !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__) && !defined(__arm__) && !defined(__AARCH64EL__) && !defined(__LITTLE_ENDIAN__)
|
||||
# define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
|
||||
# define UI8_OUT DFKnb1b
|
||||
# define SI16_IN DFKnb2b /* S = Signed */
|
||||
diff -up hdf-4.2.15/hdf/src/hdfi.h.ppc64le hdf-4.2.15/hdf/src/hdfi.h
|
||||
--- hdf-4.2.15/hdf/src/hdfi.h.ppc64le 2020-04-30 21:25:25.183973672 -0600
|
||||
+++ hdf-4.2.15/hdf/src/hdfi.h 2020-04-30 21:25:25.192973677 -0600
|
||||
@@ -75,6 +75,7 @@
|
||||
#define DFMT_IA64 0x4441
|
||||
#define DFMT_LINUX64 0x4441
|
||||
#define DFMT_POWERPC64 0x1111
|
||||
+#define DFMT_POWERPC64LE 0x4441
|
||||
#define DFMT_LINUXPPC 0x1111
|
||||
#define DFMT_LINUXSPARC 0x1111
|
||||
#define DFMT_LINUX390 0x1111
|
||||
@@ -926,18 +927,24 @@ typedef int hdf_pint_t;
|
||||
|
||||
|
||||
/*-----------------------------------------------------*/
|
||||
-/* Power PC 5 64 */
|
||||
#if defined __powerpc64__
|
||||
-
|
||||
+/* powerpc 64 bits */
|
||||
#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
|
||||
|
||||
+#ifdef __LITTLE_ENDIAN__
|
||||
+/* Power PC 8 64 little endian */
|
||||
+#define DF_MT DFMT_POWERPC64LE
|
||||
+#else
|
||||
+/* Power PC 5 64 */
|
||||
+#define DF_MT DFMT_POWERPC64
|
||||
+#endif
|
||||
+
|
||||
#include <sys/file.h> /* for unbuffered i/o stuff */
|
||||
#include <sys/stat.h>
|
||||
-#define DF_MT DFMT_POWERPC64
|
||||
typedef void VOID;
|
||||
typedef void *VOIDP;
|
||||
typedef char *_fcd;
|
||||
@@ -973,8 +980,9 @@ typedef long hdf_pint_t;
|
||||
#define INCLUDES_ARE_ANSI
|
||||
#endif
|
||||
|
||||
+#endif /* powerpc 64 bits */
|
||||
+
|
||||
/*-----------------------------------------------------*/
|
||||
-#endif /*power PC 5 64 */
|
||||
/* Linux 64 */
|
||||
#if defined(__linux__) && defined __x86_64__ && !(defined SUN) /* i.e. 64-bit Linux but not SunOS on Intel */
|
||||
|
||||
diff -up hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le hdf-4.2.15/mfhdf/libsrc/xdrposix.c
|
||||
--- hdf-4.2.15/mfhdf/libsrc/xdrposix.c.ppc64le 2020-04-30 21:25:25.186973674 -0600
|
||||
+++ hdf-4.2.15/mfhdf/libsrc/xdrposix.c 2020-04-30 21:26:18.190001127 -0600
|
||||
@@ -442,7 +442,7 @@ xdrposix_getlong(xdrs, lp)
|
||||
long *lp;
|
||||
{
|
||||
unsigned char *up = (unsigned char *)lp ;
|
||||
-#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
*lp = 0 ;
|
||||
up += (sizeof(long) - 4) ;
|
||||
#endif
|
||||
@@ -465,7 +465,7 @@ xdrposix_putlong(xdrs, lp)
|
||||
netlong mycopy = htonl(*lp);
|
||||
up = (unsigned char *)&mycopy;
|
||||
#endif
|
||||
-#if (defined AIX5L64 || defined __powerpc64__ || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
+#if (defined AIX5L64 || (defined __powerpc64__ && !defined __LITTLE_ENDIAN__) || defined __s390x__ || (defined __hpux && __LP64__))
|
||||
up += (sizeof(long) - 4) ;
|
||||
#endif
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up hdf-4.2.16-2/mfhdf/libsrc/putget.c.type hdf-4.2.16-2/mfhdf/libsrc/putget.c
|
||||
--- hdf-4.2.16-2/mfhdf/libsrc/putget.c.type 2023-02-06 07:13:34.000000000 -0700
|
||||
+++ hdf-4.2.16-2/mfhdf/libsrc/putget.c 2024-02-05 17:50:09.981633746 -0700
|
||||
@@ -593,7 +593,7 @@ xdr_NCv1data(XDR *xdrs, u_long where, nc
|
||||
#ifdef H4_HAVE_LP64
|
||||
return (xdr_int(xdrs, (nclong *)values));
|
||||
#else
|
||||
- return (xdr_long(xdrs, (nclong *)values));
|
||||
+ return (xdr_long(xdrs, (long *)values));
|
||||
#endif
|
||||
case NC_FLOAT:
|
||||
return (xdr_float(xdrs, (float *)values));
|
||||
59
hdf.spec
59
hdf.spec
|
|
@ -6,21 +6,16 @@
|
|||
%endif
|
||||
|
||||
Name: hdf
|
||||
Version: 4.2.16.2
|
||||
Release: 1%{?dist}
|
||||
Version: 4.3.0
|
||||
Release: 4%{?dist}
|
||||
Summary: A general purpose library and file format for storing scientific data
|
||||
License: BSD
|
||||
# Automatically converted from old format: BSD - review is highly recommended.
|
||||
License: LicenseRef-Callaway-BSD
|
||||
URL: https://portal.hdfgroup.org/
|
||||
Source0: https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF4/HDF4.2.16-2/src/hdf-4.2.16-2.tar.bz2
|
||||
Source0: https://github.com/HDFGroup/hdf4/archive/refs/tags/hdf%{version}.tar.gz
|
||||
Source1: h4comp
|
||||
# Fix type - https://github.com/HDFGroup/hdf4/pull/496
|
||||
Patch1: hdf-type.patch
|
||||
# Support DESTDIR in install-examples
|
||||
Patch5: hdf-destdir.patch
|
||||
# Install examples into the right location
|
||||
Patch6: hdf-examplesdir.patch
|
||||
# Fix java build
|
||||
Patch11: hdf-build.patch
|
||||
Patch1: hdf-build.patch
|
||||
|
||||
# For destdir/examplesdir patches
|
||||
BuildRequires: automake, libtool, gcc, gcc-c++
|
||||
|
|
@ -63,6 +58,14 @@ Requires: zlib-devel%{?_isa}
|
|||
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
|
||||
|
||||
|
|
@ -90,12 +93,8 @@ HDF4 java library
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n hdf-4.2.16-2
|
||||
|
||||
%patch -P 1 -p1 -b .type
|
||||
%patch -P 5 -p1 -b .destdir
|
||||
%patch -P 6 -p1 -b .examplesdir
|
||||
%patch -P 11 -p1 -b .build
|
||||
%setup -q -n hdf4-hdf%{version}
|
||||
%patch -P 1 -p1 -b .build
|
||||
|
||||
%if %{with java}
|
||||
# Replace jars with system versions
|
||||
|
|
@ -137,7 +136,7 @@ rm config/*linux-gnu
|
|||
|
||||
# TODO: upstream fix
|
||||
# libmfhdf.so is link to libdf.so
|
||||
export CFLAGS="%{optflags} -I%{_usr}/include/tirpc"
|
||||
export CFLAGS="%{optflags} -std=gnu17 -I%{_usr}/include/tirpc"
|
||||
export LIBS="-ltirpc"
|
||||
%global _configure ../configure
|
||||
# Java test needs this but doesn't create it
|
||||
|
|
@ -220,18 +219,18 @@ make -j1 -C build-static check
|
|||
%files
|
||||
%license COPYING
|
||||
%doc README.md release_notes/*.txt
|
||||
%exclude %{_pkgdocdir}/examples
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/h4?c*
|
||||
%{_libdir}/*.so.0*
|
||||
%{_mandir}/man1/*.gz
|
||||
|
||||
%files devel
|
||||
%{_bindir}/h4?c*
|
||||
%{_includedir}/%{name}/
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/*.settings
|
||||
%{_pkgdocdir}/examples/
|
||||
|
||||
%files examples
|
||||
%doc HDF4Examples
|
||||
|
||||
%files libs
|
||||
%{_libdir}/*.so.0*
|
||||
|
|
@ -247,6 +246,24 @@ make -j1 -C build-static check
|
|||
|
||||
|
||||
%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
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (hdf-4.2.16-2.tar.bz2) = bf7f2597c33e323ae416825abab9a174f183d37ac9b320b93d5924536b64d461bb43b91f0ff385acdd1200010f91d64ad234a296c4d0e471cadfc18764c66952
|
||||
SHA512 (hdf4.3.0.tar.gz) = dd1c433a393d893744c29479c756331e677d4201bb0e89f64b846d6c5d9a4fcee64e99b4ed46a97741b55cf0917002f00d8fa2582db5570aa0d6eb202242a558
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue