From fb205c10df15942ccc65e403a4405a8bcb1e8a83 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 15 Feb 2020 15:34:00 -0700 Subject: [PATCH] Update to 1.12.1 --- .gitignore | 3 + fix-HDFFV-10745.patch | 13 ----- hdf5-LD_LIBRARY_PATH.patch | 13 ++--- hdf5-build.patch | 117 ++++++++++++++++++++----------------- hdf5-warning.patch | 67 --------------------- hdf5.spec | 64 +++++++++++--------- sources | 4 +- 7 files changed, 112 insertions(+), 169 deletions(-) delete mode 100644 fix-HDFFV-10745.patch delete mode 100644 hdf5-warning.patch diff --git a/.gitignore b/.gitignore index 0bf4ac9..8e76bef 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ hdf5-1.8.5.tar.bz2 /hdf5-1.10.6.tar.bz2 /hdf5-1.10.7.tar.bz2 /hdf5_1.10.6+repack-2.debian.tar.xz +/hdf5-1.12.0.tar.bz2 +/hdf5-1.12.1.tar.bz2 +/hdf5_1.12.0+repack-1~exp2.debian.tar.xz diff --git a/fix-HDFFV-10745.patch b/fix-HDFFV-10745.patch deleted file mode 100644 index 64cd705..0000000 --- a/fix-HDFFV-10745.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: hdf5/java/src/jni/h5pFCPLImp.c -=================================================================== ---- hdf5.orig/java/src/jni/h5pFCPLImp.c -+++ hdf5/java/src/jni/h5pFCPLImp.c -@@ -240,7 +240,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1sym_1k - - done: - if (theArray) -- UNPIN_LONG_ARRAY(ENVONLY, size, theArray, (status < 0) ? JNI_ABORT : 0); -+ UNPIN_INT_ARRAY(ENVONLY, size, theArray, (status < 0) ? JNI_ABORT : 0); - - return (jint)status; - } /* end Java_hdf_hdf5lib_H5_H5Pget_1sym_1k */ diff --git a/hdf5-LD_LIBRARY_PATH.patch b/hdf5-LD_LIBRARY_PATH.patch index 7d01278..f1852e7 100644 --- a/hdf5-LD_LIBRARY_PATH.patch +++ b/hdf5-LD_LIBRARY_PATH.patch @@ -1,21 +1,20 @@ -diff -up hdf5-1.8.13/src/Makefile.am.LD_LIBRARY_PATH hdf5-1.8.13/src/Makefile.am ---- hdf5-1.8.13/src/Makefile.am.LD_LIBRARY_PATH 2014-05-05 20:13:01.000000000 -0600 -+++ hdf5-1.8.13/src/Makefile.am 2014-05-15 09:53:59.569476295 -0600 -@@ -128,8 +128,6 @@ settings_DATA=libhdf5.settings +--- hdf5-1.12.0/src/Makefile.am~ 2020-02-29 00:29:58.000000000 +0100 ++++ hdf5-1.12.0/src/Makefile.am 2021-02-26 16:10:03.612252484 +0100 +@@ -156,8 +156,6 @@ # Remove the generated .c file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. H5Tinit.c: H5detect$(EXEEXT) - LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ - sed -e 's/-L/:/g' -e 's/ //g'`" \ - $(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \ + $(RUNSERIAL) ./H5detect$(EXEEXT) $@ || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ ($(RM) $@ ; exit 1) -@@ -140,8 +138,6 @@ H5Tinit.c: H5detect$(EXEEXT) +@@ -168,8 +166,6 @@ # Remove the generated .c file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings - LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ - sed -e 's/-L/:/g' -e 's/ //g'`" \ - $(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@ || \ + $(RUNSERIAL) ./H5make_libsettings$(EXEEXT) $@ || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ ($(RM) $@ ; exit 1) diff --git a/hdf5-build.patch b/hdf5-build.patch index 66ba115..cc08c02 100644 --- a/hdf5-build.patch +++ b/hdf5-build.patch @@ -1,19 +1,21 @@ -diff -up hdf5-1.10.7/java/examples/datasets/JavaDatasetExample.sh.in.build hdf5-1.10.7/java/examples/datasets/JavaDatasetExample.sh.in ---- hdf5-1.10.7/java/examples/datasets/JavaDatasetExample.sh.in.build 2020-08-27 21:38:23.000000000 -0600 -+++ hdf5-1.10.7/java/examples/datasets/JavaDatasetExample.sh.in 2020-10-07 20:27:26.540707493 -0600 +diff --git a/java/examples/datasets/JavaDatasetExample.sh.in b/java/examples/datasets/JavaDatasetExample.sh.in +index f29739a..fc9cddb 100644 +--- a/java/examples/datasets/JavaDatasetExample.sh.in ++++ b/java/examples/datasets/JavaDatasetExample.sh.in @@ -39,7 +39,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" - BLDLIBDIR="$top_builddir/hdf5/lib" BLDDIR="." + BLDLIBDIR="$BLDDIR/testlibs" HDFTEST_HOME="$top_srcdir/java/examples/datasets" -JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar +JARFILE=@PACKAGE_TARNAME@.jar TESTJARFILE=jar@PACKAGE_TARNAME@datasets.jar test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR -diff -up hdf5-1.10.7/java/examples/datasets/Makefile.am.build hdf5-1.10.7/java/examples/datasets/Makefile.am ---- hdf5-1.10.7/java/examples/datasets/Makefile.am.build 2020-08-27 21:38:23.000000000 -0600 -+++ hdf5-1.10.7/java/examples/datasets/Makefile.am 2020-10-07 20:27:26.540707493 -0600 -@@ -27,7 +27,7 @@ classes: +diff --git a/java/examples/datasets/Makefile.am b/java/examples/datasets/Makefile.am +index 41a914b..195201a 100644 +--- a/java/examples/datasets/Makefile.am ++++ b/java/examples/datasets/Makefile.am +@@ -26,7 +26,7 @@ classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) pkgpath = examples/datasets @@ -22,22 +24,24 @@ diff -up hdf5-1.10.7/java/examples/datasets/Makefile.am.build hdf5-1.10.7/java/e CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)datasets.jar -diff -up hdf5-1.10.7/java/examples/datatypes/JavaDatatypeExample.sh.in.build hdf5-1.10.7/java/examples/datatypes/JavaDatatypeExample.sh.in ---- hdf5-1.10.7/java/examples/datatypes/JavaDatatypeExample.sh.in.build 2020-02-05 19:04:23.000000000 -0700 -+++ hdf5-1.10.7/java/examples/datatypes/JavaDatatypeExample.sh.in 2020-10-07 20:27:26.541707501 -0600 +diff --git a/java/examples/datatypes/JavaDatatypeExample.sh.in b/java/examples/datatypes/JavaDatatypeExample.sh.in +index e26d8c0..f6a9d87 100644 +--- a/java/examples/datatypes/JavaDatatypeExample.sh.in ++++ b/java/examples/datatypes/JavaDatatypeExample.sh.in @@ -36,7 +36,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" - BLDLIBDIR="$top_builddir/hdf5/lib" BLDDIR="." + BLDLIBDIR="$BLDDIR/testlibs" HDFTEST_HOME="$top_srcdir/java/examples/datatypes" -JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar +JARFILE=@PACKAGE_TARNAME@.jar TESTJARFILE=jar@PACKAGE_TARNAME@datatypes.jar test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR -diff -up hdf5-1.10.7/java/examples/datatypes/Makefile.am.build hdf5-1.10.7/java/examples/datatypes/Makefile.am ---- hdf5-1.10.7/java/examples/datatypes/Makefile.am.build 2020-08-27 21:38:23.000000000 -0600 -+++ hdf5-1.10.7/java/examples/datatypes/Makefile.am 2020-10-07 20:27:26.541707501 -0600 -@@ -27,7 +27,7 @@ classes: +diff --git a/java/examples/datatypes/Makefile.am b/java/examples/datatypes/Makefile.am +index 90790f7..450edef 100644 +--- a/java/examples/datatypes/Makefile.am ++++ b/java/examples/datatypes/Makefile.am +@@ -26,7 +26,7 @@ classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) pkgpath = examples/datatypes @@ -46,22 +50,24 @@ diff -up hdf5-1.10.7/java/examples/datatypes/Makefile.am.build hdf5-1.10.7/java/ CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)datatypes.jar -diff -up hdf5-1.10.7/java/examples/groups/JavaGroupExample.sh.in.build hdf5-1.10.7/java/examples/groups/JavaGroupExample.sh.in ---- hdf5-1.10.7/java/examples/groups/JavaGroupExample.sh.in.build 2020-02-05 19:04:23.000000000 -0700 -+++ hdf5-1.10.7/java/examples/groups/JavaGroupExample.sh.in 2020-10-07 20:27:26.541707501 -0600 -@@ -37,7 +37,7 @@ BLDLIBDIR="$top_builddir/hdf5/lib" +diff --git a/java/examples/groups/JavaGroupExample.sh.in b/java/examples/groups/JavaGroupExample.sh.in +index 3b0e9d1..416c69f 100644 +--- a/java/examples/groups/JavaGroupExample.sh.in ++++ b/java/examples/groups/JavaGroupExample.sh.in +@@ -37,7 +37,7 @@ BLDDIR="." + BLDLIBDIR="$BLDDIR/testlibs" BLDITERDIR="./groups" - BLDDIR="." HDFTEST_HOME="$top_srcdir/java/examples/groups" -JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar +JARFILE=@PACKAGE_TARNAME@.jar TESTJARFILE=jar@PACKAGE_TARNAME@groups.jar test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR test -d $BLDITERDIR || mkdir -p $BLDITERDIR -diff -up hdf5-1.10.7/java/examples/groups/Makefile.am.build hdf5-1.10.7/java/examples/groups/Makefile.am ---- hdf5-1.10.7/java/examples/groups/Makefile.am.build 2020-08-27 21:38:23.000000000 -0600 -+++ hdf5-1.10.7/java/examples/groups/Makefile.am 2020-10-07 20:27:26.542707509 -0600 -@@ -27,7 +27,7 @@ classes: +diff --git a/java/examples/groups/Makefile.am b/java/examples/groups/Makefile.am +index bfde9ae..f48a5b9 100644 +--- a/java/examples/groups/Makefile.am ++++ b/java/examples/groups/Makefile.am +@@ -26,7 +26,7 @@ classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) pkgpath = examples/groups @@ -70,22 +76,24 @@ diff -up hdf5-1.10.7/java/examples/groups/Makefile.am.build hdf5-1.10.7/java/exa CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)groups.jar -diff -up hdf5-1.10.7/java/examples/intro/JavaIntroExample.sh.in.build hdf5-1.10.7/java/examples/intro/JavaIntroExample.sh.in ---- hdf5-1.10.7/java/examples/intro/JavaIntroExample.sh.in.build 2020-02-05 19:04:23.000000000 -0700 -+++ hdf5-1.10.7/java/examples/intro/JavaIntroExample.sh.in 2020-10-07 20:27:26.542707509 -0600 +diff --git a/java/examples/intro/JavaIntroExample.sh.in b/java/examples/intro/JavaIntroExample.sh.in +index db741e5..d0ba65d 100644 +--- a/java/examples/intro/JavaIntroExample.sh.in ++++ b/java/examples/intro/JavaIntroExample.sh.in @@ -36,7 +36,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" - BLDLIBDIR="$top_builddir/hdf5/lib" BLDDIR="." + BLDLIBDIR="$BLDDIR/testlibs" HDFTEST_HOME="$top_srcdir/java/examples/intro" -JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar +JARFILE=@PACKAGE_TARNAME@.jar TESTJARFILE=jar@PACKAGE_TARNAME@intro.jar test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR -diff -up hdf5-1.10.7/java/examples/intro/Makefile.am.build hdf5-1.10.7/java/examples/intro/Makefile.am ---- hdf5-1.10.7/java/examples/intro/Makefile.am.build 2020-08-27 21:38:23.000000000 -0600 -+++ hdf5-1.10.7/java/examples/intro/Makefile.am 2020-10-07 20:27:26.542707509 -0600 -@@ -27,7 +27,7 @@ classes: +diff --git a/java/examples/intro/Makefile.am b/java/examples/intro/Makefile.am +index 7d1aeab..01a10c9 100644 +--- a/java/examples/intro/Makefile.am ++++ b/java/examples/intro/Makefile.am +@@ -26,7 +26,7 @@ classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) pkgpath = examples/intro @@ -94,10 +102,11 @@ diff -up hdf5-1.10.7/java/examples/intro/Makefile.am.build hdf5-1.10.7/java/exam CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)intro.jar -diff -up hdf5-1.10.7/java/src/Makefile.am.build hdf5-1.10.7/java/src/Makefile.am ---- hdf5-1.10.7/java/src/Makefile.am.build 2020-09-04 15:50:58.000000000 -0600 -+++ hdf5-1.10.7/java/src/Makefile.am 2020-10-07 20:27:26.542707509 -0600 -@@ -33,8 +33,8 @@ JAVAROOT = .classes +diff --git a/java/src/Makefile.am b/java/src/Makefile.am +index 98630e6..fd8d057 100644 +--- a/java/src/Makefile.am ++++ b/java/src/Makefile.am +@@ -32,8 +32,8 @@ JAVAROOT = .classes classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) @@ -108,22 +117,11 @@ diff -up hdf5-1.10.7/java/src/Makefile.am.build hdf5-1.10.7/java/src/Makefile.am pkgpath = hdf/hdf5lib CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$$CLASSPATH -diff -up hdf5-1.10.7/java/test/junit.sh.in.build hdf5-1.10.7/java/test/junit.sh.in ---- hdf5-1.10.7/java/test/junit.sh.in.build 2020-09-04 15:50:58.000000000 -0600 -+++ hdf5-1.10.7/java/test/junit.sh.in 2020-10-07 22:14:59.047682005 -0600 -@@ -46,7 +46,7 @@ HDFLIB_HOME="$top_srcdir/java/lib" - BLDDIR="." - BLDLIBDIR="$BLDDIR/testlibs" - 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 hdf5-1.10.7/java/test/Makefile.am.build hdf5-1.10.7/java/test/Makefile.am ---- hdf5-1.10.7/java/test/Makefile.am.build 2020-09-04 15:50:58.000000000 -0600 -+++ hdf5-1.10.7/java/test/Makefile.am 2020-10-07 20:27:26.543707517 -0600 -@@ -27,7 +27,7 @@ classes: +diff --git a/java/test/Makefile.am b/java/test/Makefile.am +index 08e79e3..b336c2f 100644 +--- a/java/test/Makefile.am ++++ b/java/test/Makefile.am +@@ -26,7 +26,7 @@ classes: test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT) pkgpath = test @@ -132,3 +130,16 @@ diff -up hdf5-1.10.7/java/test/Makefile.am.build hdf5-1.10.7/java/test/Makefile. 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.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)test.jar +diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in +index 39db296..83d6c7c 100644 +--- a/java/test/junit.sh.in ++++ b/java/test/junit.sh.in +@@ -47,7 +47,7 @@ BLDLIBDIR="$BLDDIR/testlibs" + HDFTEST_HOME="$top_srcdir/java/test" + TOOLS_TESTFILES="$top_srcdir/tools/testfiles" + +-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar ++JARFILE=@PACKAGE_TARNAME@.jar + TESTJARFILE=jar@PACKAGE_TARNAME@test.jar + test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR + diff --git a/hdf5-warning.patch b/hdf5-warning.patch deleted file mode 100644 index 25ff9e4..0000000 --- a/hdf5-warning.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -up hdf5-1.10.7/testpar/t_cache.c.warning hdf5-1.10.7/testpar/t_cache.c ---- hdf5-1.10.7/testpar/t_cache.c.warning 2020-09-04 15:50:58.000000000 -0600 -+++ hdf5-1.10.7/testpar/t_cache.c 2020-10-07 20:23:01.877566435 -0600 -@@ -80,8 +80,8 @@ long local_pins = 0; - - - /* the following fields are used by the server process only */ --int total_reads = 0; --int total_writes = 0; -+unsigned total_reads = 0; -+unsigned total_writes = 0; - - - /***************************************************************************** -@@ -176,8 +176,8 @@ struct datum - hbool_t local_pinned; - hbool_t cleared; - hbool_t flushed; -- int reads; -- int writes; -+ unsigned reads; -+ unsigned writes; - int index; - struct H5AC_aux_t * aux_ptr; - }; -@@ -2445,12 +2445,12 @@ static herr_t - datum_image_len(const void *thing, size_t *image_len) - { - int idx; -- struct datum * entry_ptr; -+ const struct datum * entry_ptr; - - HDassert( thing ); - HDassert( image_len ); - -- entry_ptr = (struct datum *)thing; -+ entry_ptr = (const struct datum *)thing; - - idx = addr_to_datum_index(entry_ptr->base_addr); - -@@ -4612,7 +4612,7 @@ verify_entry_reads(haddr_t addr, - int expected_entry_reads) - { - hbool_t success = TRUE; -- int reported_entry_reads = 0; -+ unsigned reported_entry_reads = 0; - struct mssg_t mssg; - - if ( success ) { -@@ -4719,7 +4719,7 @@ verify_entry_writes(haddr_t addr, - int expected_entry_writes) - { - hbool_t success = TRUE; -- int reported_entry_writes = 0; -+ unsigned reported_entry_writes = 0; - struct mssg_t mssg; - - if ( success ) { -@@ -4824,7 +4824,7 @@ static hbool_t - verify_total_reads(int expected_total_reads) - { - hbool_t success = TRUE; /* will set to FALSE if appropriate. */ -- long reported_total_reads; -+ unsigned reported_total_reads; - struct mssg_t mssg; - - if ( success ) { diff --git a/hdf5.spec b/hdf5.spec index c2d97a6..ed1a6dc 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -1,26 +1,28 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) # Patch version? -%global snaprel %{nil} +#global snaprel -beta ## WARNING: Wait for netcdf 4.8.0 ! # NOTE: Try not to release new versions to released versions of Fedora # You need to recompile all users of HDF5 for each version change Name: hdf5 -Version: 1.10.7 -Release: 2%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD URL: https://portal.hdfgroup.org/display/HDF5/HDF5 -Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/hdf5-%{version}.tar.bz2 +%global version_main %(echo %version | cut -d. -f-2) +Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%{version_main}/hdf5-%{version}/src/hdf5-%{version}.tar.bz2 + +%global so_version 200 + Source1: h5comp # For man pages -Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.10.6+repack-2.debian.tar.xz +Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.12.0+repack-1~exp2.debian.tar.xz Patch0: hdf5-LD_LIBRARY_PATH.patch -# Fix some warnings -Patch2: hdf5-warning.patch # Fix java build Patch3: hdf5-build.patch # Remove Fedora build flags from h5cc/h5c++/h5fc @@ -37,6 +39,7 @@ BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: time BuildRequires: zlib-devel +BuildRequires: hostname # For patches/rpath BuildRequires: automake BuildRequires: libtool @@ -157,11 +160,7 @@ HDF5 parallel openmpi static libraries %prep -%setup -q -a 2 -n %{name}-%{version}%{?snaprel} -%patch0 -p1 -b .LD_LIBRARY_PATH -%patch2 -p1 -b .warning -%patch3 -p1 -b .build -%patch5 -p1 -b .wrappers +%autosetup -a 2 -n %{name}-%{version}%{?snaprel} -p1 # Replace jars with system versions # hamcrest-core is obsoleted in hamcrest-2.2 @@ -188,7 +187,6 @@ autoreconf -f -i # Modify low optimization level for gnu compilers sed -e 's|-O -finline-functions|-O3 -finline-functions|g' -i config/gnu-flags - %build #Do out of tree builds %global _configure ../configure @@ -217,8 +215,9 @@ ln -s ../configure . %{configure_opts} \ --enable-cxx \ --enable-java -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -make LDFLAGS="%{__global_ldflags} -fPIC -Wl,-z,now -Wl,--as-needed" +sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool +sed -r -i 's|^prefix=/usr|prefix=%{buildroot}/usr|' java/test/junit.sh +%make_build LDFLAGS="%{__global_ldflags} -fPIC -Wl,-z,now -Wl,--as-needed" popd #MPI builds @@ -242,7 +241,7 @@ do --datarootdir=%{_libdir}/$mpi/share \ --mandir=%{_libdir}/$mpi/share/man sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool - make LDFLAGS="%{__global_ldflags} -fPIC -Wl,-z,now -Wl,--as-needed" + %make_build LDFLAGS="%{__global_ldflags} -fPIC -Wl,-z,now -Wl,--as-needed" module purge popd done @@ -257,7 +256,7 @@ mv %{buildroot}%{_includedir}/*.mod %{buildroot}%{_fmoddir} for mpi in %{?mpi_list} do module load mpi/$mpi-%{_arch} - make -C $mpi install DESTDIR=%{buildroot} + %make_install -C $mpi rm %{buildroot}/%{_libdir}/$mpi/lib/*.la #Fortran modules mkdir -p %{buildroot}${MPI_FORTRAN_MOD_DIR} @@ -310,7 +309,6 @@ rm %{buildroot}%{_mandir}/man1/h5p[cf]c*.1 mkdir -p %{buildroot}%{_libdir}/%{name} mv %{buildroot}%{_libdir}/libhdf5_java.so %{buildroot}%{_libdir}/%{name}/ - %check make -C build check #export HDF5_Make_Ignore=yes @@ -327,10 +325,19 @@ do module purge done +# I have no idea why those get installed. But it's easier to just +# delete them, than to fight with the byzantine build system. +# And yes, it's using /usr/lib not %_libdir. +if [ %_libdir != /usr/lib ]; then + rm -vf \ + %{buildroot}/usr/lib/*.jar \ + %{buildroot}/usr/lib/*.la \ + %{buildroot}/usr/lib/*.lai \ + %{buildroot}/usr/lib/libhdf5* +fi %ldconfig_scriptlets - %files %license COPYING %doc MANIFEST README.txt release_docs/RELEASE.txt @@ -355,12 +362,12 @@ done %{_bindir}/h5watch %{_bindir}/mirror_server %{_bindir}/mirror_server_stop -%{_libdir}/libhdf5.so.103* -%{_libdir}/libhdf5_cpp.so.103* -%{_libdir}/libhdf5_fortran.so.102* -%{_libdir}/libhdf5hl_fortran.so.100* -%{_libdir}/libhdf5_hl.so.100* -%{_libdir}/libhdf5_hl_cpp.so.100* +%{_libdir}/libhdf5.so.%{so_version}* +%{_libdir}/libhdf5_cpp.so.%{so_version}* +%{_libdir}/libhdf5_fortran.so.%{so_version}* +%{_libdir}/libhdf5hl_fortran.so.%{so_version}* +%{_libdir}/libhdf5_hl.so.%{so_version}* +%{_libdir}/libhdf5_hl_cpp.so.%{so_version}* %{_mandir}/man1/gif2h5.1* %{_mandir}/man1/h52gif.1* %{_mandir}/man1/h5copy.1* @@ -428,7 +435,7 @@ done %{_libdir}/mpich/bin/mirror_server %{_libdir}/mpich/bin/mirror_server_stop %{_libdir}/mpich/bin/ph5diff -%{_libdir}/mpich/lib/*.so.10* +%{_libdir}/mpich/lib/*.so.%{so_version}* %files mpich-devel %{_includedir}/mpich-%{_arch} @@ -473,7 +480,7 @@ done %{_libdir}/openmpi/bin/mirror_server %{_libdir}/openmpi/bin/mirror_server_stop %{_libdir}/openmpi/bin/ph5diff -%{_libdir}/openmpi/lib/*.so.10* +%{_libdir}/openmpi/lib/*.so.%{so_version}* %files openmpi-devel %{_includedir}/openmpi-%{_arch} @@ -492,6 +499,9 @@ done %changelog +* Sat Nov 20 2021 Orion Poplawski - 1.12.1-1 +- Update to 1.12.1 + * Mon Aug 30 2021 Orion Poplawski - 1.10.7-2 - Fix typo in h5fc (bz#1998879) diff --git a/sources b/sources index ac9223d..d8cd890 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (hdf5-1.10.7.tar.bz2) = bfbd045ea5d7940ac1d0f9aef964dad2e9f22d78b49c90668021106259c9612352fbcb4e89085a7fa189f58142ef83a363c6220ea89aa0d57bdfed245df0ab57 -SHA512 (hdf5_1.10.6+repack-2.debian.tar.xz) = 56a817bec56ef439259787e174172e5045d34b3b398b3fb95e42147a9b6a42e81f456d8527af4ec283226d84c7f247c63a7fa65654edebabe0de0bddfc038b71 +SHA512 (hdf5-1.12.1.tar.bz2) = 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd +SHA512 (hdf5_1.12.0+repack-1~exp2.debian.tar.xz) = 4c58d3021a634abe79211a6292d105f0ac9f1cc748e5033f8fefa845265e37104a3d6ef91deac51b85a26b5bc426095ca80ea606e1c3b730d3709368f8ffee9c