From 5104f9c534e1518843b81aa892a7967fab09188e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:08:56 +0000 Subject: [PATCH 1/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index fec8205..5ba307e 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.2.16.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/ @@ -247,6 +247,9 @@ make -j1 -C build-static check %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 4.2.16.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 30 2024 Orion Poplawski - 4.2.16.2-1 - Update to 4.2.16-2 From 0acf39f8dc75e4eb9af3a007b388cf19fd9d1841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 08:42:36 +0200 Subject: [PATCH 2/6] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- hdf.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hdf.spec b/hdf.spec index 5ba307e..b50353f 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,9 +7,10 @@ Name: hdf Version: 4.2.16.2 -Release: 2%{?dist} +Release: 3%{?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 Source1: h4comp @@ -247,6 +248,9 @@ make -j1 -C build-static check %changelog +* Mon Sep 02 2024 Miroslav Suchý - 4.2.16.2-3 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 4.2.16.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From aa2f244f8831becf6b87942c37ebb094d1b12dd8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 8 Feb 2024 08:07:37 -0700 Subject: [PATCH 3/6] Update to 4.3.0 --- .gitignore | 1 + hdf-build.patch | 40 ++++++++----------------- hdf-destdir.patch | 70 ------------------------------------------- hdf-examplesdir.patch | 50 ------------------------------- hdf.spec | 39 ++++++++++++------------ sources | 2 +- 6 files changed, 35 insertions(+), 167 deletions(-) delete mode 100644 hdf-destdir.patch delete mode 100644 hdf-examplesdir.patch diff --git a/.gitignore b/.gitignore index f989858..57826f0 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/hdf-build.patch b/hdf-build.patch index 79d9940..6531214 100644 --- a/hdf-build.patch +++ b/hdf-build.patch @@ -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) diff --git a/hdf-destdir.patch b/hdf-destdir.patch deleted file mode 100644 index 57793f3..0000000 --- a/hdf-destdir.patch +++ /dev/null @@ -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: diff --git a/hdf-examplesdir.patch b/hdf-examplesdir.patch deleted file mode 100644 index 3bb66ab..0000000 --- a/hdf-examplesdir.patch +++ /dev/null @@ -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) diff --git a/hdf.spec b/hdf.spec index b50353f..f430ff2 100644 --- a/hdf.spec +++ b/hdf.spec @@ -6,22 +6,16 @@ %endif Name: hdf -Version: 4.2.16.2 -Release: 3%{?dist} +Version: 4.3.0 +Release: 1%{?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://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++ @@ -64,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 @@ -91,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 @@ -221,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* @@ -248,6 +246,9 @@ make -j1 -C build-static check %changelog +* Mon Sep 30 2024 Orion Poplawski - 4.3.0-1 +- Update to 4.3.0 + * Mon Sep 02 2024 Miroslav Suchý - 4.2.16.2-3 - convert license to SPDX diff --git a/sources b/sources index d380cc3..779b64a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hdf-4.2.16-2.tar.bz2) = bf7f2597c33e323ae416825abab9a174f183d37ac9b320b93d5924536b64d461bb43b91f0ff385acdd1200010f91d64ad234a296c4d0e471cadfc18764c66952 +SHA512 (hdf4.3.0.tar.gz) = dd1c433a393d893744c29479c756331e677d4201bb0e89f64b846d6c5d9a4fcee64e99b4ed46a97741b55cf0917002f00d8fa2582db5570aa0d6eb202242a558 From de8fc8291f6832f1c11e4271e640f389c28be00b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 05:49:12 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index f430ff2..1c5a403 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.3.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -246,6 +246,9 @@ make -j1 -C build-static check %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 4.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 30 2024 Orion Poplawski - 4.3.0-1 - Update to 4.3.0 From 7df79300fefcb6afab620439e5218c407099b992 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 19 Jan 2025 12:25:05 +0100 Subject: [PATCH 5/6] Fix GCC15 builds --- hdf-ppc64le.patch | 83 ----------------------------------------------- hdf-type.patch | 12 ------- hdf.spec | 7 ++-- 3 files changed, 5 insertions(+), 97 deletions(-) delete mode 100644 hdf-ppc64le.patch delete mode 100644 hdf-type.patch diff --git a/hdf-ppc64le.patch b/hdf-ppc64le.patch deleted file mode 100644 index e199a55..0000000 --- a/hdf-ppc64le.patch +++ /dev/null @@ -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 /* for unbuffered i/o stuff */ - #include --#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 - diff --git a/hdf-type.patch b/hdf-type.patch deleted file mode 100644 index 123356c..0000000 --- a/hdf-type.patch +++ /dev/null @@ -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)); diff --git a/hdf.spec b/hdf.spec index 1c5a403..97a2fc7 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.3.0 -Release: 2%{?dist} +Release: 3%{?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 @@ -136,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 @@ -246,6 +246,9 @@ make -j1 -C build-static check %changelog +* Sun Jan 19 2025 Antonio Trande - 4.3.0-3 +- Fix GCC15 builds + * Fri Jan 17 2025 Fedora Release Engineering - 4.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4b5dd59b1291310b733df199b9d21253cc43ac4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:56:31 +0000 Subject: [PATCH 6/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- hdf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hdf.spec b/hdf.spec index 97a2fc7..7fa948e 100644 --- a/hdf.spec +++ b/hdf.spec @@ -7,7 +7,7 @@ Name: hdf Version: 4.3.0 -Release: 3%{?dist} +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 @@ -246,6 +246,9 @@ make -j1 -C build-static check %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 4.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Antonio Trande - 4.3.0-3 - Fix GCC15 builds