From 0d2cb1467cd9751624412c375879ff95fc15fb22 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 3 Apr 2019 21:17:09 +0200 Subject: [PATCH 01/16] - updated to 1.10.5 - updated sig patch - removed obsolete config patch - added sh patch --- hdf5-cmake.patch | 24 ++++++++++----------- hdf5-config.patch | 15 ------------- hdf5-sh.patch | 47 ++++++++++++++++++++++++++++++++++++++++ hdf5-sig.patch | 11 +++++----- hdf5.spec | 55 +++++++++++++++++++++++------------------------ 5 files changed, 92 insertions(+), 60 deletions(-) delete mode 100644 hdf5-config.patch create mode 100644 hdf5-sh.patch diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index 25c91e5..d6c37b9 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -278,12 +278,12 @@ +# Import target "hdf5::hdf5-shared" for configuration "" +set_property(TARGET hdf5::hdf5-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.10.3.2" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.1.0" + IMPORTED_SONAME_NOCONFIG "libhdf5.so.10" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5-shared ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5-shared "${_IMPORT_PREFIX}/@lib@/libhdf5.so.10" ) ++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5-shared "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103" ) + +# Import target "hdf5::hdf5_tools-static" for configuration "" +set_property(TARGET hdf5::hdf5_tools-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) @@ -298,12 +298,12 @@ +# Import target "hdf5::hdf5_tools-shared" for configuration "" +set_property(TARGET hdf5::hdf5_tools-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_tools-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.10.3.2" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.1.0" + IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.10" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_tools-shared ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.10.3.2" ) ++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.1.0" ) + +# Import target "hdf5::h5diff" for configuration "" +set_property(TARGET hdf5::h5diff APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) @@ -481,11 +481,11 @@ +set_property(TARGET hdf5::hdf5_hl-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl-shared PROPERTIES + IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.10" -+ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.10.2.2" ++ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.2" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl-shared ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.10" ) ++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100" ) + +# Import target "hdf5::gif2h5" for configuration "" +set_property(TARGET hdf5::gif2h5 APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) @@ -518,12 +518,12 @@ +# Import target "hdf5::hdf5_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.16.0.0" -+ IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.16" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.1.0" ++ IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.103" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_cpp-shared ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_cpp-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.16" ) ++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_cpp-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103" ) + +# Import target "hdf5::hdf5_hl_cpp-static" for configuration "" +set_property(TARGET hdf5::hdf5_hl_cpp-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) @@ -538,12 +538,12 @@ +# Import target "hdf5::hdf5_hl_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_hl_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.11.1.2" -+ IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.11" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.3" ++ IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.100" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl_cpp-shared ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl_cpp-shared "${_IMPORT_PREFIX}/lib/libhdf5_hl_cpp-shared.so.11" ) ++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl_cpp-shared "${_IMPORT_PREFIX}/lib/libhdf5_hl_cpp-shared.so.100" ) + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) diff --git a/hdf5-config.patch b/hdf5-config.patch deleted file mode 100644 index 277dd49..0000000 --- a/hdf5-config.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- hdf5-1.8.16/config/gnu-flags.orig 2015-11-26 21:06:26.741682874 +0100 -+++ hdf5-1.8.16/config/gnu-flags 2015-11-26 21:08:37.605010716 +0100 -@@ -99,10 +99,10 @@ - # Production - case "$cc_vendor-$cc_version" in - gcc-[34].*) -- PROD_CFLAGS="-O3" -+ PROD_CFLAGS= - ;; - gcc-5.*) -- PROD_CFLAGS="-O3 -fstdarg-opt" -+ PROD_CFLAGS="-fstdarg-opt" - ;; - *) - PROD_CFLAGS="-O -finline-functions" diff --git a/hdf5-sh.patch b/hdf5-sh.patch new file mode 100644 index 0000000..44c5edd --- /dev/null +++ b/hdf5-sh.patch @@ -0,0 +1,47 @@ +--- hdf5-1.10.5/m4/aclocal_cxx.m4.orig 2018-09-04 04:54:44.000000000 +0200 ++++ hdf5-1.10.5/m4/aclocal_cxx.m4 2019-04-02 21:29:26.123178128 +0200 +@@ -26,7 +26,7 @@ + dnl Checking if C++ needs old style header files in includes + AC_DEFUN([PAC_PROG_CXX_HEADERS],[ + AC_MSG_CHECKING([if $CXX needs old style header files in includes]) +- TEST_SRC="`(echo \"#define OLD_HEADER_FILENAME 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define OLD_HEADER_FILENAME 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" + + AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], + [AC_MSG_RESULT([no])], +@@ -38,7 +38,7 @@ + dnl Checking if ++ can handle namespaces + AC_DEFUN([PAC_PROG_CXX_NAMESPACE],[ + AC_MSG_CHECKING([if $CXX can handle namespaces]) +- TEST_SRC="`(echo \"#define HDF_NO_NAMESPACE 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define HDF_NO_NAMESPACE 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" + + AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) +@@ -49,7 +49,7 @@ + dnl Checking if C++ supports std + AC_DEFUN([PAC_PROG_CXX_STD],[ + AC_MSG_CHECKING([if $CXX supports std]) +- TEST_SRC="`(echo \"#define HDF_NO_STD 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define HDF_NO_STD 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" + + AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) +@@ -60,7 +60,7 @@ + dnl Checking if C++ has offsetof extension + AC_DEFUN([PAC_PROG_CXX_OFFSETOF],[ + AC_MSG_CHECKING([if $CXX has offsetof extension]) +- TEST_SRC="`(echo \"#define CXX_HAVE_OFFSETOF 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define CXX_HAVE_OFFSETOF 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" + + AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])],[AC_MSG_RESULT([yes]) + AC_DEFINE([CXX_HAVE_OFFSETOF], [1], [Define if C++ compiler recognizes offsetof])], +@@ -70,7 +70,7 @@ + dnl Checking if C++ can handle static cast + AC_DEFUN([PAC_PROG_CXX_STATIC_CAST],[ + AC_MSG_CHECKING([if $CXX can handle static cast]) +- TEST_SRC="`(echo \"#define NO_STATIC_CAST 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define NO_STATIC_CAST 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" + + AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) diff --git a/hdf5-sig.patch b/hdf5-sig.patch index b6c3c67..5f47fe0 100644 --- a/hdf5-sig.patch +++ b/hdf5-sig.patch @@ -1,14 +1,15 @@ ---- hdf5-1.8.20/configure.ac.orig 2018-05-08 18:00:29.595517793 +0200 -+++ hdf5-1.8.20/configure.ac 2018-05-08 18:02:35.958849694 +0200 -@@ -1585,11 +1585,16 @@ - AC_CHECK_FUNCS([alarm clock_gettime difftime fork frexpf frexpl]) - AC_CHECK_FUNCS([gethostname getrusage gettimeofday]) +--- hdf5-1.10.5/configure.ac.orig 2019-04-02 21:10:59.572506160 +0200 ++++ hdf5-1.10.5/configure.ac 2019-04-02 21:11:57.108861125 +0200 +@@ -1852,12 +1852,17 @@ + AC_CHECK_FUNCS([alarm clock_gettime difftime fcntl flock fork frexpf]) + AC_CHECK_FUNCS([frexpl gethostname getrusage gettimeofday]) AC_CHECK_FUNCS([lstat rand_r random setsysinfo]) -AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigsetjmp sigprocmask]) +AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigprocmask]) AC_CHECK_FUNCS([snprintf srandom strdup symlink system]) AC_CHECK_FUNCS([strtoll strtoull]) AC_CHECK_FUNCS([tmpfile asprintf vasprintf vsnprintf waitpid]) + AC_CHECK_FUNCS([roundf lroundf llroundf round lround llround]) +dnl cannot be detected in glibc by plain AC_CHECK_FUNCS +AH_TEMPLATE([HAVE_SIGSETJMP], [Have sigsetjmp function]) diff --git a/hdf5.spec b/hdf5.spec index 2a09ba5..7afebbf 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -10,15 +10,15 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 -Version: 1.8.21 +Version: 1.10.5 Release: 1 License: Nearly BSD, but changed sources must be marked Group: Libraries -Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 2d2408f2a9dfb5c7b79998002e9a90e9 -Patch0: %{name}-config.patch -Patch1: %{name}-sig.patch -Patch2: %{name}-cmake.patch +Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 +# Source0-md5: 7c19d6b81ee2a3ba7d36f6922b2f90d3 +Patch0: %{name}-sig.patch +Patch1: %{name}-cmake.patch +Patch2: %{name}-sh.patch URL: https://support.hdfgroup.org/HDF5/ BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.11 @@ -184,16 +184,17 @@ Narzędzia do konwersji z i to formatu HDF5. %configure \ --docdir=%{_docdir} \ --disable-silent-rules \ + --enable-build-node=production \ --enable-cxx \ --enable-fortran \ %{?with_fortran2003:--enable-fortran2003} \ %{?with_mpi:--enable-parallel --enable-unsupported} \ - --enable-production \ --enable-shared \ + --with-optimization="" \ --with-pthread \ %{?with_szip:--with-szlib} -# --enable-threadsafe is incompatible with cxx/fortran +# --enable-threadsafe is unspported with cxx/fortran/java/hl %{__make} @@ -278,9 +279,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc COPYING README.txt release_docs/{HISTORY*.txt,RELEASE.txt} %attr(755,root,root) %{_libdir}/libhdf5.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhdf5.so.10 +%attr(755,root,root) %ghost %{_libdir}/libhdf5.so.103 %attr(755,root,root) %{_libdir}/libhdf5_hl.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.10 +%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl.so.100 # used to show configuration at runtime %{_libdir}/libhdf5.settings @@ -309,11 +310,13 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/H5FDpublic.h %{_includedir}/H5FDsec2.h %{_includedir}/H5FDstdio.h +%{_includedir}/H5FDwindows.h %{_includedir}/H5Fpublic.h %{_includedir}/H5Gpublic.h %{_includedir}/H5IMpublic.h %{_includedir}/H5Include.h %{_includedir}/H5Ipublic.h +%{_includedir}/H5LDpublic.h %{_includedir}/H5LTpublic.h %{_includedir}/H5Lpublic.h %{_includedir}/H5MMpublic.h @@ -352,9 +355,9 @@ rm -rf $RPM_BUILD_ROOT %files c++ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libhdf5_cpp.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.16 +%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.103 %attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.11 +%attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.100 %files c++-devel %defattr(644,root,root,755) @@ -364,7 +367,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libhdf5_cpp.la %{_libdir}/libhdf5_hl_cpp.la %{_includedir}/H5AbstractDs.h -%{_includedir}/H5AcreatProp.h %{_includedir}/H5ArrayType.h %{_includedir}/H5AtomType.h %{_includedir}/H5Attribute.h @@ -373,6 +375,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/H5CompType.h %{_includedir}/H5Cpp.h %{_includedir}/H5CppDoc.h +%{_includedir}/H5DaccProp.h %{_includedir}/H5DataSet.h %{_includedir}/H5DataSpace.h %{_includedir}/H5DataType.h @@ -397,7 +400,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/H5PredType.h %{_includedir}/H5PropList.h %{_includedir}/H5StrType.h -%{_includedir}/H5StrcreatProp.h %{_includedir}/H5VarLenType.h %{_examplesdir}/%{name}-%{version}/c++ %{_examplesdir}/%{name}-%{version}/hl/c++ @@ -410,66 +412,62 @@ rm -rf $RPM_BUILD_ROOT %files fortran %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libhdf5_fortran.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhdf5_fortran.so.10 +%attr(755,root,root) %ghost %{_libdir}/libhdf5_fortran.so.102 %attr(755,root,root) %{_libdir}/libhdf5hl_fortran.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhdf5hl_fortran.so.10 +%attr(755,root,root) %ghost %{_libdir}/libhdf5hl_fortran.so.100 %files fortran-devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/h5fc %attr(755,root,root) %{_libdir}/libhdf5_fortran.so +%attr(755,root,root) %{_libdir}/libhdf5_hl_fortran.so %attr(755,root,root) %{_libdir}/libhdf5hl_fortran.so %{_libdir}/libhdf5_fortran.la %{_libdir}/libhdf5hl_fortran.la %{_includedir}/H5f90i.h %{_includedir}/H5f90i_gen.h -%{_includedir}/h5_dble_interface.mod +%{_includedir}/h5_gen.mod %{_includedir}/h5a.mod -%{_includedir}/h5a_provisional.mod %{_includedir}/h5d.mod -%{_includedir}/h5d_provisional.mod %{_includedir}/h5ds.mod %{_includedir}/h5e.mod -%{_includedir}/h5e_provisional.mod %{_includedir}/h5f.mod -%{_includedir}/h5f_provisional.mod +%{_includedir}/h5fortkit.mod %{_includedir}/h5fortran_types.mod %{_includedir}/h5g.mod %{_includedir}/h5global.mod %{_includedir}/h5i.mod %{_includedir}/h5im.mod %{_includedir}/h5l.mod -%{_includedir}/h5l_provisional.mod %{_includedir}/h5lib.mod -%{_includedir}/h5lib_provisional.mod %{_includedir}/h5lt.mod +%{_includedir}/h5lt_const.mod %{_includedir}/h5o.mod -%{_includedir}/h5o_provisional.mod %{_includedir}/h5p.mod -%{_includedir}/h5p_provisional.mod %{_includedir}/h5r.mod -%{_includedir}/h5r_provisional.mod %{_includedir}/h5s.mod %{_includedir}/h5t.mod -%{_includedir}/h5t_provisional.mod %{_includedir}/h5tb.mod -%{_includedir}/h5test_kind_storage_size_mod.mod +%{_includedir}/h5tb_const.mod %{_includedir}/h5z.mod %{_includedir}/hdf5.mod %files fortran-static %defattr(644,root,root,755) %{_libdir}/libhdf5_fortran.a +%{_libdir}/libhdf5_hl_fortran.a %{_libdir}/libhdf5hl_fortran.a %files progs %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gif2h5 %attr(755,root,root) %{_bindir}/h52gif +%attr(755,root,root) %{_bindir}/h5clear %attr(755,root,root) %{_bindir}/h5copy %attr(755,root,root) %{_bindir}/h5debug %attr(755,root,root) %{_bindir}/h5diff %attr(755,root,root) %{_bindir}/h5dump +%attr(755,root,root) %{_bindir}/h5format_convert %attr(755,root,root) %{_bindir}/h5import %attr(755,root,root) %{_bindir}/h5jam %attr(755,root,root) %{_bindir}/h5ls @@ -480,3 +478,4 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/h5repart %attr(755,root,root) %{_bindir}/h5stat %attr(755,root,root) %{_bindir}/h5unjam +%attr(755,root,root) %{_bindir}/h5watch -- 2.44.0 From 8cdec0b7c4926abcf587acb5d51e225e61a0d34c Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 27 Dec 2019 05:33:36 +0100 Subject: [PATCH 02/16] - updated to 1.10.6 - added bconds for ros3 (default on) and hdfs (default off) vfds --- hdf5.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/hdf5.spec b/hdf5.spec index 7afebbf..1c84a15 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -3,30 +3,33 @@ # - check missing file # # Conditional build: -%bcond_without fortran2003 # Fortran 2003 interface +%bcond_with hdfs # HDFS driver (requires libhdfs, hdfs.h) +%bcond_without s3 # R/O S3 driver %bcond_without szip # SZIP compression support %bcond_with mpi # parallel version of library using MPI # Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 -Version: 1.10.5 +Version: 1.10.6 Release: 1 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 7c19d6b81ee2a3ba7d36f6922b2f90d3 +# Source0-md5: 03095102a6118c32a75a9b9b40be66f2 Patch0: %{name}-sig.patch Patch1: %{name}-cmake.patch Patch2: %{name}-sh.patch URL: https://support.hdfgroup.org/HDF5/ BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.11 -BuildRequires: gcc-fortran >= %{?with_fortran2003:6:4.2}%{!?with_fortran2003:5:4.0} +%{?with_s3:BuildRequires: curl-devel} +BuildRequires: gcc-fortran >= 6:4.2 BuildRequires: libjpeg-devel >= 6b BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:2.2 %{?with_mpi:BuildRequires: mpi-devel} +%{?with_s3:BuildRequires: openssl-devel} %{?with_szip:BuildRequires: szip-devel >= 2.0} BuildRequires: zlib-devel >= 1.1.3 Obsoletes: hdf5_hl @@ -51,6 +54,8 @@ Summary: HDF5 library development package Summary(pl.UTF-8): Pliki nagłówkowe biblioteki HDF5 Group: Development/Libraries Requires: %{name} = %{version}-%{release} +%{?with_s3:Requires: curl-devel} +%{?with_s3:Requires: openssl-devel} %{?with_szip:Requires: szip-devel >= 2.0} Requires: zlib-devel Obsoletes: hdf5_hl-devel @@ -134,7 +139,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe API Fortran bibliotek HDF5 Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-fortran = %{version}-%{release} -Requires: gcc-fortran >= %{?with_fortran2003:6:4.2}%{!?with_fortran2003:5:4.0} +Requires: gcc-fortran >= 6:4.2 %description fortran-devel Module and header files for HDF5 Fortran APIs (both base hdf5 and @@ -184,13 +189,13 @@ Narzędzia do konwersji z i to formatu HDF5. %configure \ --docdir=%{_docdir} \ --disable-silent-rules \ - --enable-build-node=production \ --enable-cxx \ + --enable-direct-vfd \ --enable-fortran \ - %{?with_fortran2003:--enable-fortran2003} \ %{?with_mpi:--enable-parallel --enable-unsupported} \ + %{?with_s3:--enable-ros3-vfd} \ --enable-shared \ - --with-optimization="" \ + %{?with_hdfs:--with-libhdfs=%{_includedir},%{_libdir}} \ --with-pthread \ %{?with_szip:--with-szlib} @@ -234,7 +239,6 @@ for f in hdf5-config-version.cmake hdf5-config.cmake hdf5-targets.cmake hdf5-tar -e "s,@H5_VERS_SUBRELEASE@,$vsubr," \ -e 's,@HDF5_ENABLE_PARALLEL@,OFF,' \ -e 's,@HDF5_BUILD_FORTRAN@,ON,' \ - -e 's,@HDF5_ENABLE_F2003@,%{?with_fortran2003:ON}%{!?with_fortran2003:OFF},' \ -e 's,@HDF5_BUILD_CPP_LIB@,ON,' \ -e 's,@HDF5_BUILD_TOOLS@,ON,' \ -e 's,@HDF5_BUILD_HL_LIB@,ON,' \ @@ -303,11 +307,13 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/H5FDcore.h %{_includedir}/H5FDdirect.h %{_includedir}/H5FDfamily.h +%{_includedir}/H5FDhdfs.h %{_includedir}/H5FDlog.h %{_includedir}/H5FDmpi.h %{_includedir}/H5FDmpio.h %{_includedir}/H5FDmulti.h %{_includedir}/H5FDpublic.h +%{_includedir}/H5FDros3.h %{_includedir}/H5FDsec2.h %{_includedir}/H5FDstdio.h %{_includedir}/H5FDwindows.h -- 2.44.0 From 2632f16ad227c23cc6840062e65ed2e058338c5d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 31 Dec 2019 19:06:32 +0100 Subject: [PATCH 03/16] - update library versions for cmake; release 2 --- hdf5-cmake.patch | 18 +++++++++--------- hdf5.spec | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index d6c37b9..90fcbaf 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -278,8 +278,8 @@ +# Import target "hdf5::hdf5-shared" for configuration "" +set_property(TARGET hdf5::hdf5-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.1.0" -+ IMPORTED_SONAME_NOCONFIG "libhdf5.so.10" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.2.0" ++ IMPORTED_SONAME_NOCONFIG "libhdf5.so.103" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5-shared ) @@ -298,12 +298,12 @@ +# Import target "hdf5::hdf5_tools-shared" for configuration "" +set_property(TARGET hdf5::hdf5_tools-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_tools-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.1.0" -+ IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.10" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.2.0" ++ IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.103" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_tools-shared ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.1.0" ) ++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.2.0" ) + +# Import target "hdf5::h5diff" for configuration "" +set_property(TARGET hdf5::h5diff APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) @@ -480,8 +480,8 @@ +# Import target "hdf5::hdf5_hl-shared" for configuration "" +set_property(TARGET hdf5::hdf5_hl-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.10" -+ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.2" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100" ++ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.3" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl-shared ) @@ -518,7 +518,7 @@ +# Import target "hdf5::hdf5_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.1.0" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.2.0" + IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.103" + ) + @@ -538,7 +538,7 @@ +# Import target "hdf5::hdf5_hl_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_hl_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.3" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.4" + IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.100" + ) + diff --git a/hdf5.spec b/hdf5.spec index 1c84a15..e1c128d 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -12,7 +12,7 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 Version: 1.10.6 -Release: 1 +Release: 2 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -- 2.44.0 From 66f4ea15b42bc22d42790305f1bc419513bf71b8 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 11 Nov 2020 12:52:42 +0100 Subject: [PATCH 04/16] - updated to 1.10.7 --- hdf5-cmake.patch | 10 +++++----- hdf5.spec | 10 +++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index 90fcbaf..63749c0 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -298,12 +298,12 @@ +# Import target "hdf5::hdf5_tools-shared" for configuration "" +set_property(TARGET hdf5::hdf5_tools-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_tools-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.2.0" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.3.0" + IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.103" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_tools-shared ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.2.0" ) ++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.3.0" ) + +# Import target "hdf5::h5diff" for configuration "" +set_property(TARGET hdf5::h5diff APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) @@ -481,7 +481,7 @@ +set_property(TARGET hdf5::hdf5_hl-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl-shared PROPERTIES + IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100" -+ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.3" ++ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.4" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl-shared ) @@ -518,7 +518,7 @@ +# Import target "hdf5::hdf5_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.2.0" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.3.0" + IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.103" + ) + @@ -538,7 +538,7 @@ +# Import target "hdf5::hdf5_hl_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_hl_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.4" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.5" + IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.100" + ) + diff --git a/hdf5.spec b/hdf5.spec index e1c128d..6fc1529 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -11,12 +11,12 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 -Version: 1.10.6 -Release: 2 +Version: 1.10.7 +Release: 1 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 03095102a6118c32a75a9b9b40be66f2 +# Source0-md5: dff8a882b61d0b59296dccc3ad13dc29 Patch0: %{name}-sig.patch Patch1: %{name}-cmake.patch Patch2: %{name}-sh.patch @@ -309,12 +309,14 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/H5FDfamily.h %{_includedir}/H5FDhdfs.h %{_includedir}/H5FDlog.h +%{_includedir}/H5FDmirror.h %{_includedir}/H5FDmpi.h %{_includedir}/H5FDmpio.h %{_includedir}/H5FDmulti.h %{_includedir}/H5FDpublic.h %{_includedir}/H5FDros3.h %{_includedir}/H5FDsec2.h +%{_includedir}/H5FDsplitter.h %{_includedir}/H5FDstdio.h %{_includedir}/H5FDwindows.h %{_includedir}/H5Fpublic.h @@ -485,3 +487,5 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/h5stat %attr(755,root,root) %{_bindir}/h5unjam %attr(755,root,root) %{_bindir}/h5watch +%attr(755,root,root) %{_bindir}/mirror_server +%attr(755,root,root) %{_bindir}/mirror_server_stop -- 2.44.0 From c7ae2dbd348bad5611832c123ad3f6bb51154b4e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 11 Nov 2020 18:38:44 +0100 Subject: [PATCH 05/16] - added java-hdf5 packages (with epoch 1 to replace java-hdf5 2.11/3.3.1 from hdf-java.spec) --- hdf5.spec | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/hdf5.spec b/hdf5.spec index 6fc1529..b5ed052 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -4,6 +4,7 @@ # # Conditional build: %bcond_with hdfs # HDFS driver (requires libhdfs, hdfs.h) +%bcond_without java # Java wrappers %bcond_without s3 # R/O S3 driver %bcond_without szip # SZIP compression support %bcond_with mpi # parallel version of library using MPI @@ -174,6 +175,34 @@ Utilities to convert from/to HDF5 format. %description progs -l pl.UTF-8 Narzędzia do konwersji z i to formatu HDF5. +%package -n java-hdf5 +Summary: Java HDF5 Interface (JHI5) +Summary(pl.UTF-8): Interfejs HDF5 do Javy (JHI5) +# to replace java-hdf5 [0:]2.11/3.3.1 from hdf-java.spec +Epoch: 1 +Group: Libraries/Java +URL: http://portal.hdfgroup.org/display/HDFVIEW/JHI5+Design+Notes +Requires: java-slf4j >= 1.7.25 + +%description -n java-hdf5 +The Java Native Interface to the standard HDF5 library. + +%description -n java-hdf5 -l pl.UTF-8 +Natywny interfejs Javy (JNI) do biblioteki standardowej HDF5. + +%package -n java-hdf5-javadoc +Summary: Javadoc documentation for Java HDF5 Interface (JHI5) +Summary(pl.UTF-8): Dokumentacja javadoc do interfejsu HDF5 do Javy (JHI5) +Epoch: 1 +Group: Documentation +URL: http://portal.hdfgroup.org/display/HDFVIEW/JHI5+Design+Notes + +%description -n java-hdf5-javadoc +Javadoc documentation for Java HDF5 Interface (JHI5). + +%description -n java-hdf5-javadoc -l pl.UTF-8 +Dokumentacja javadoc do interfejsu HDF5 do Javy (JHI5). + %prep %setup -q %patch0 -p1 @@ -192,6 +221,7 @@ Narzędzia do konwersji z i to formatu HDF5. --enable-cxx \ --enable-direct-vfd \ --enable-fortran \ + %{?with_java:--enable-java} \ %{?with_mpi:--enable-parallel --enable-unsupported} \ %{?with_s3:--enable-ros3-vfd} \ --enable-shared \ @@ -208,7 +238,15 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_includedir} %{__make} install-recursive \ - DESTDIR=$RPM_BUILD_ROOT + DESTDIR=$RPM_BUILD_ROOT \ + hdf5_javadir=%{_javadir} + +%if %{with java} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhdf5_java.la +ln -sf jarhdf5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jarhdf5.jar +install -d $RPM_BUILD_ROOT%{_javadocdir} +cp -pr java/src/javadoc $RPM_BUILD_ROOT%{_javadocdir}/hdf5lib +%endif install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/hl %{__make} -C examples install-examples \ @@ -489,3 +527,15 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/h5watch %attr(755,root,root) %{_bindir}/mirror_server %attr(755,root,root) %{_bindir}/mirror_server_stop + +%if %{with java} +%files -n java-hdf5 +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libhdf5_java.so +%{_javadir}/jarhdf5-%{version}.jar +%{_javadir}/jarhdf5.jar + +%files -n java-hdf5-javadoc +%defattr(644,root,root,755) +%{_javadocdir}/hdf5lib +%endif -- 2.44.0 From 5181f5b2b2052b35b7488db4b4b6bff0a0fc8f16 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 12 Nov 2020 21:00:09 +0100 Subject: [PATCH 06/16] - BR: jdk for java --- hdf5.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/hdf5.spec b/hdf5.spec index b5ed052..8dba896 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -26,6 +26,7 @@ BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.11 %{?with_s3:BuildRequires: curl-devel} BuildRequires: gcc-fortran >= 6:4.2 +%{?with_java:BuildRequires: jdk} BuildRequires: libjpeg-devel >= 6b BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:2.2 -- 2.44.0 From e6465c7a32f6edf61c47aaf09d7066367d703ac4 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 13 Nov 2020 06:21:25 +0100 Subject: [PATCH 07/16] - java- R: base --- hdf5.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/hdf5.spec b/hdf5.spec index 8dba896..932e826 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -183,6 +183,7 @@ Summary(pl.UTF-8): Interfejs HDF5 do Javy (JHI5) Epoch: 1 Group: Libraries/Java URL: http://portal.hdfgroup.org/display/HDFVIEW/JHI5+Design+Notes +Requires: %{name} = %{version}-%{release} Requires: java-slf4j >= 1.7.25 %description -n java-hdf5 -- 2.44.0 From e27c3d3a31f00f60e7ab57633347901046fcde27 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 13 Nov 2020 20:18:49 +0100 Subject: [PATCH 08/16] - rediffed cmake patch with fuzz 0 --- hdf5-cmake.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index 63749c0..e8c78b0 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -1,6 +1,6 @@ --- hdf5-1.8.16/config/cmake/hdf5-config.cmake.in.orig 2015-10-24 07:14:03.000000000 +0200 +++ hdf5-1.8.16/config/cmake/hdf5-config.cmake.in 2015-11-26 21:14:53.838328233 +0100 -@@ -1,7 +1,6 @@ +@@ -12,7 +12,6 @@ #----------------------------------------------------------------------------- # HDF5 Config file for compiling against hdf5 build/install directory #----------------------------------------------------------------------------- @@ -8,8 +8,8 @@ string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME) -@@ -47,7 +46,7 @@ - set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH}") +@@ -79,7 +78,7 @@ + set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_DIRS}") set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@") -set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@") @@ -17,7 +17,7 @@ if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB) set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@") -@@ -63,7 +62,7 @@ +@@ -95,7 +94,7 @@ if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS) set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@") @@ -26,7 +26,7 @@ endif () #----------------------------------------------------------------------------- -@@ -154,7 +153,3 @@ +@@ -205,7 +204,3 @@ endif () endforeach () endforeach () -- 2.44.0 From 18998ffc141a418f4ebbdfdc5f8ebc31ba2c4b0b Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 24 Nov 2020 20:12:16 +0100 Subject: [PATCH 09/16] - release 2 (rebuild without libcurl.la) --- hdf5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5.spec b/hdf5.spec index 932e826..dc29456 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -13,7 +13,7 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 Version: 1.10.7 -Release: 1 +Release: 2 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -- 2.44.0 From 92b4083a17435dd3a10af150b0ce461515946817 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 12 Dec 2020 16:14:15 +0100 Subject: [PATCH 10/16] - fixed libhdf5 version in cmake patch; release 3 --- hdf5-cmake.patch | 2 +- hdf5.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index e8c78b0..5c77531 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -278,7 +278,7 @@ +# Import target "hdf5::hdf5-shared" for configuration "" +set_property(TARGET hdf5::hdf5-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.2.0" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.3.0" + IMPORTED_SONAME_NOCONFIG "libhdf5.so.103" + ) + diff --git a/hdf5.spec b/hdf5.spec index dc29456..4e4df03 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -13,7 +13,7 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 Version: 1.10.7 -Release: 2 +Release: 3 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -- 2.44.0 From 80e1a6f9b7002dc35d15fe031a1414d5b9e4a80c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 24 Sep 2021 23:27:36 +0200 Subject: [PATCH 11/16] rebuild with openssl 3.0.0 Release 4 (by relup.sh) --- hdf5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5.spec b/hdf5.spec index 4e4df03..de88e2b 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -13,7 +13,7 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 Version: 1.10.7 -Release: 3 +Release: 4 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -- 2.44.0 From 0304e88531dd6f918c13b51b0b0df67a1ec71ab7 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 4 Feb 2023 20:44:19 +0100 Subject: [PATCH 12/16] - updated to 1.10.9 --- hdf5-sig.patch | 10 +++++----- hdf5.spec | 23 +++++++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/hdf5-sig.patch b/hdf5-sig.patch index 5f47fe0..bb7c293 100644 --- a/hdf5-sig.patch +++ b/hdf5-sig.patch @@ -1,14 +1,14 @@ ---- hdf5-1.10.5/configure.ac.orig 2019-04-02 21:10:59.572506160 +0200 -+++ hdf5-1.10.5/configure.ac 2019-04-02 21:11:57.108861125 +0200 -@@ -1852,12 +1852,17 @@ - AC_CHECK_FUNCS([alarm clock_gettime difftime fcntl flock fork frexpf]) +--- hdf5-1.10.9/configure.ac.orig 2023-02-04 17:50:31.414727750 +0100 ++++ hdf5-1.10.9/configure.ac 2023-02-04 17:56:08.986232301 +0100 +@@ -2146,12 +2146,17 @@ AC_SEARCH_LIBS([clock_gettime], [rt posi + AC_CHECK_FUNCS([alarm asprintf clock_gettime difftime fcntl flock fork frexpf]) AC_CHECK_FUNCS([frexpl gethostname getrusage gettimeofday]) AC_CHECK_FUNCS([lstat rand_r random setsysinfo]) -AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigsetjmp sigprocmask]) +AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigprocmask]) AC_CHECK_FUNCS([snprintf srandom strdup symlink system]) AC_CHECK_FUNCS([strtoll strtoull]) - AC_CHECK_FUNCS([tmpfile asprintf vasprintf vsnprintf waitpid]) + AC_CHECK_FUNCS([tmpfile vasprintf vsnprintf waitpid]) AC_CHECK_FUNCS([roundf lroundf llroundf round lround llround]) +dnl cannot be detected in glibc by plain AC_CHECK_FUNCS diff --git a/hdf5.spec b/hdf5.spec index de88e2b..de1cdac 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -12,12 +12,12 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 -Version: 1.10.7 -Release: 4 +Version: 1.10.9 +Release: 1 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: dff8a882b61d0b59296dccc3ad13dc29 +# Source0-md5: 8f9eac14d3ee4719c3e4b52863ea42e9 Patch0: %{name}-sig.patch Patch1: %{name}-cmake.patch Patch2: %{name}-sh.patch @@ -34,7 +34,7 @@ BuildRequires: libtool >= 2:2.2 %{?with_s3:BuildRequires: openssl-devel} %{?with_szip:BuildRequires: szip-devel >= 2.0} BuildRequires: zlib-devel >= 1.1.3 -Obsoletes: hdf5_hl +Obsoletes: hdf5_hl < 5180 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -60,8 +60,8 @@ Requires: %{name} = %{version}-%{release} %{?with_s3:Requires: openssl-devel} %{?with_szip:Requires: szip-devel >= 2.0} Requires: zlib-devel -Obsoletes: hdf5_hl-devel -Obsoletes: hdf5_hl-tutor +Obsoletes: hdf5_hl-devel < 5180 +Obsoletes: hdf5_hl-tutor < 5180 %description devel Header files for HDF5 library and HDF5 documentation. @@ -74,7 +74,7 @@ Summary: HDF5 static library Summary(pl.UTF-8): Statyczna biblioteka HDF5 Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} -Obsoletes: hdf5_hl-static +Obsoletes: hdf5_hl-static < 5180 %description static Static version of HDF5 library. @@ -319,9 +319,12 @@ rm -rf $RPM_BUILD_ROOT %post fortran -p /sbin/ldconfig %postun fortran -p /sbin/ldconfig +%post -n java-hdf5 -p /sbin/ldconfig +%postun -n java-hdf5 -p /sbin/ldconfig + %files %defattr(644,root,root,755) -%doc COPYING README.txt release_docs/{HISTORY*.txt,RELEASE.txt} +%doc COPYING README.md release_docs/{HISTORY*.txt,RELEASE.txt} %attr(755,root,root) %{_libdir}/libhdf5.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libhdf5.so.103 %attr(755,root,root) %{_libdir}/libhdf5_hl.so.*.*.* @@ -527,12 +530,12 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/h5stat %attr(755,root,root) %{_bindir}/h5unjam %attr(755,root,root) %{_bindir}/h5watch -%attr(755,root,root) %{_bindir}/mirror_server -%attr(755,root,root) %{_bindir}/mirror_server_stop %if %{with java} %files -n java-hdf5 %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libhdf5_java.so.100.7.0 +%attr(755,root,root) %ghost %{_libdir}/libhdf5_java.so.100 %attr(755,root,root) %{_libdir}/libhdf5_java.so %{_javadir}/jarhdf5-%{version}.jar %{_javadir}/jarhdf5.jar -- 2.44.0 From 9c68a88fdb239e54fb092a194a691df45579b6a5 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sat, 18 Feb 2023 15:10:25 +0100 Subject: [PATCH 13/16] fix path to hdf5-targs.cmake; rel 2 --- hdf5-cmake.patch | 19 ++++++++++++++----- hdf5.spec | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index 5c77531..4f7e29b 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -1,5 +1,5 @@ ---- hdf5-1.8.16/config/cmake/hdf5-config.cmake.in.orig 2015-10-24 07:14:03.000000000 +0200 -+++ hdf5-1.8.16/config/cmake/hdf5-config.cmake.in 2015-11-26 21:14:53.838328233 +0100 +--- hdf5-1.10.9/config/cmake/hdf5-config.cmake.in.orig 2022-05-19 05:31:38.000000000 +0200 ++++ hdf5-1.10.9/config/cmake/hdf5-config.cmake.in 2023-02-18 15:06:15.857876492 +0100 @@ -12,7 +12,6 @@ #----------------------------------------------------------------------------- # HDF5 Config file for compiling against hdf5 build/install directory @@ -8,7 +8,7 @@ string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME) -@@ -79,7 +78,7 @@ +@@ -81,7 +80,7 @@ set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_DIRS}") set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@") @@ -17,7 +17,7 @@ if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB) set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@") -@@ -95,7 +94,7 @@ +@@ -97,7 +96,7 @@ if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS) set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@") @@ -26,7 +26,16 @@ endif () #----------------------------------------------------------------------------- -@@ -205,7 +204,3 @@ +@@ -118,7 +117,7 @@ + if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) + include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) + endif () +- include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) ++ include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) + endif () + + # Handle default component(static) : +@@ -208,7 +207,3 @@ endif () endforeach () endforeach () diff --git a/hdf5.spec b/hdf5.spec index de1cdac..4a6485e 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -13,7 +13,7 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 Version: 1.10.9 -Release: 1 +Release: 2 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -- 2.44.0 From 840c1cf35a84a53aa3800882893052317e650a2f Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sat, 18 Feb 2023 16:29:44 +0100 Subject: [PATCH 14/16] update library versions in cmake patch; rel 3 --- hdf5-cmake.patch | 8 ++++---- hdf5.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index 4f7e29b..a1e76ef 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -287,7 +287,7 @@ +# Import target "hdf5::hdf5-shared" for configuration "" +set_property(TARGET hdf5::hdf5-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.3.0" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.3.2" + IMPORTED_SONAME_NOCONFIG "libhdf5.so.103" + ) + @@ -490,7 +490,7 @@ +set_property(TARGET hdf5::hdf5_hl-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl-shared PROPERTIES + IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100" -+ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.4" ++ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.6" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl-shared ) @@ -527,7 +527,7 @@ +# Import target "hdf5::hdf5_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.3.0" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.4.1" + IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.103" + ) + @@ -547,7 +547,7 @@ +# Import target "hdf5::hdf5_hl_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_hl_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.5" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.7" + IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.100" + ) + diff --git a/hdf5.spec b/hdf5.spec index 4a6485e..8d87eff 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -13,7 +13,7 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 Version: 1.10.9 -Release: 2 +Release: 3 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -- 2.44.0 From 78d57859909ccc1d3749019eb8a50f4d6a8733e1 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 15 Mar 2023 22:11:15 +0100 Subject: [PATCH 15/16] - updated URL - adjust PACKAGE_SHARE_INSTALL_DIR consistently - updated HDF5_VERSION_MAJOR --- hdf5-cmake.patch | 9 --------- hdf5.spec | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index a1e76ef..ff0a289 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -26,15 +26,6 @@ endif () #----------------------------------------------------------------------------- -@@ -118,7 +117,7 @@ - if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) - include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) - endif () -- include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) -+ include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) - endif () - - # Handle default component(static) : @@ -208,7 +207,3 @@ endif () endforeach () diff --git a/hdf5.spec b/hdf5.spec index 8d87eff..6ac7cad 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -21,7 +21,7 @@ Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version Patch0: %{name}-sig.patch Patch1: %{name}-cmake.patch Patch2: %{name}-sh.patch -URL: https://support.hdfgroup.org/HDF5/ +URL: https://www.hdfgroup.org/solutions/hdf5/ BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.11 %{?with_s3:BuildRequires: curl-devel} @@ -271,7 +271,7 @@ for f in hdf5-config-version.cmake hdf5-config.cmake hdf5-targets.cmake hdf5-tar sed -e 's,@HDF5_PACKAGE@,hdf5,g' \ -e 's,@HDF_PACKAGE_EXT@,,' \ -e "s,@HDF5_VERSION_STRING@,%{version}," \ - -e "s,@HDF5_VERSION_MAJOR@,1.8," \ + -e "s,@HDF5_VERSION_MAJOR@,1.10," \ -e "s,@HDF5_VERSION_MINOR@,$vrel," \ -e "s,@H5_VERS_MAJOR@,$vmajor," \ -e "s,@H5_VERS_MINOR@,$vminor," \ @@ -302,7 +302,7 @@ for f in hdf5-config-version.cmake hdf5-config.cmake hdf5-targets.cmake hdf5-tar %{?with_mpi:-e 's,@MPI_C_INCLUDE_PATH@,%{_includedir},'} \ %{?with_mpi:-e 's,@MPI_C_LIBRARIES@,%{_libdir},'} \ -e 's,@PACKAGE_INCLUDE_INSTALL_DIR@,%{_includedir},' \ - -e 's,@PACKAGE_SHARE_INSTALL_DIR@,%{_libdir}/cmake,' \ + -e 's,@PACKAGE_SHARE_INSTALL_DIR@,%{_libdir}/cmake/hdf5,' \ -e 's,@PACKAGE_CURRENT_BUILD_DIR@,%{_prefix},' \ config/cmake/${f}.in > $RPM_BUILD_ROOT%{_libdir}/cmake/hdf5/$f done -- 2.44.0 From 6f201a709a901bbe34a92ed8d04bd26a94b54da8 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 21 Aug 2023 17:37:20 +0200 Subject: [PATCH 16/16] - updated to 1.10.10; gif2h5/h52gif removed (deprecated and disabled by default, have known CVEs) --- hdf5-cmake.patch | 42 +++++++++--------------------------------- hdf5-sh.patch | 34 +++++++++++++++++----------------- hdf5.spec | 10 ++++------ 3 files changed, 30 insertions(+), 56 deletions(-) diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch index ff0a289..d0ee001 100644 --- a/hdf5-cmake.patch +++ b/hdf5-cmake.patch @@ -36,7 +36,7 @@ -endforeach () --- hdf5-1.8.20/config/cmake/hdf5-targets.cmake.in.orig 1970-01-01 01:00:00.000000000 +0100 +++ hdf5-1.8.20/config/cmake/hdf5-targets.cmake.in 2018-05-09 18:50:11.684497207 +0200 -@@ -0,0 +1,218 @@ +@@ -0,0 +1,212 @@ +# Generated by CMake + +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) @@ -55,7 +55,7 @@ +set(_targetsDefined) +set(_targetsNotDefined) +set(_expectedTargets) -+foreach(_expectedTarget hdf5::hdf5-static hdf5::hdf5-shared hdf5::hdf5_tools-static hdf5::hdf5_tools-shared hdf5::h5diff hdf5::h5diff-shared hdf5::h5ls hdf5::h5ls-shared hdf5::h5debug hdf5::h5repart hdf5::h5mkgrp hdf5::h5import hdf5::h5repack hdf5::h5repack-shared hdf5::h5jam hdf5::h5unjam hdf5::h5copy hdf5::h5copy-shared hdf5::h5stat hdf5::h5stat-shared hdf5::h5dump hdf5::h5dump-shared hdf5::hdf5_hl-static hdf5::hdf5_hl-shared hdf5::gif2h5 hdf5::h52gif hdf5::hdf5_cpp-static hdf5::hdf5_cpp-shared hdf5::hdf5_hl_cpp-static hdf5::hdf5_hl_cpp-shared) ++foreach(_expectedTarget hdf5::hdf5-static hdf5::hdf5-shared hdf5::hdf5_tools-static hdf5::hdf5_tools-shared hdf5::h5diff hdf5::h5diff-shared hdf5::h5ls hdf5::h5ls-shared hdf5::h5debug hdf5::h5repart hdf5::h5mkgrp hdf5::h5import hdf5::h5repack hdf5::h5repack-shared hdf5::h5jam hdf5::h5unjam hdf5::h5copy hdf5::h5copy-shared hdf5::h5stat hdf5::h5stat-shared hdf5::h5dump hdf5::h5dump-shared hdf5::hdf5_hl-static hdf5::hdf5_hl-shared hdf5::hdf5_cpp-static hdf5::hdf5_cpp-shared hdf5::hdf5_hl_cpp-static hdf5::hdf5_hl_cpp-shared) + list(APPEND _expectedTargets ${_expectedTarget}) + if(NOT TARGET ${_expectedTarget}) + list(APPEND _targetsNotDefined ${_expectedTarget}) @@ -194,12 +194,6 @@ + INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared" +) + -+# Create imported target hdf5::gif2h5 -+add_executable(hdf5::gif2h5 IMPORTED) -+ -+# Create imported target hdf5::h52gif -+add_executable(hdf5::h52gif IMPORTED) -+ +# Create imported target hdf5::hdf5_cpp-static +add_library(hdf5::hdf5_cpp-static STATIC IMPORTED) + @@ -257,7 +251,7 @@ +cmake_policy(POP) --- hdf5-1.8.20/config/cmake/hdf5-targets-noconfig.cmake.in.orig 1970-01-01 01:00:00.000000000 +0100 +++ hdf5-1.8.20/config/cmake/hdf5-targets-noconfig.cmake.in 2018-05-09 18:54:57.997827272 +0200 -@@ -0,0 +1,289 @@ +@@ -0,0 +1,271 @@ +#---------------------------------------------------------------- +# Generated CMake target import file. +#---------------------------------------------------------------- @@ -278,7 +272,7 @@ +# Import target "hdf5::hdf5-shared" for configuration "" +set_property(TARGET hdf5::hdf5-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.3.2" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so.103.4.0" + IMPORTED_SONAME_NOCONFIG "libhdf5.so.103" + ) + @@ -298,12 +292,12 @@ +# Import target "hdf5::hdf5_tools-shared" for configuration "" +set_property(TARGET hdf5::hdf5_tools-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_tools-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.3.0" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.so.103.4.0" + IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.103" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_tools-shared ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.3.0" ) ++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-shared "${_IMPORT_PREFIX}/lib/libhdf5_tools-shared.so.103.4.0" ) + +# Import target "hdf5::h5diff" for configuration "" +set_property(TARGET hdf5::h5diff APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) @@ -481,30 +475,12 @@ +set_property(TARGET hdf5::hdf5_hl-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl-shared PROPERTIES + IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100" -+ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.6" ++ IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.100.1.7" + ) + +list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl-shared ) +list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl-shared "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so.100" ) + -+# Import target "hdf5::gif2h5" for configuration "" -+set_property(TARGET hdf5::gif2h5 APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) -+set_target_properties(hdf5::gif2h5 PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/gif2h5" -+ ) -+ -+list(APPEND _IMPORT_CHECK_TARGETS hdf5::gif2h5 ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::gif2h5 "${_IMPORT_PREFIX}/bin/gif2h5" ) -+ -+# Import target "hdf5::h52gif" for configuration "" -+set_property(TARGET hdf5::h52gif APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) -+set_target_properties(hdf5::h52gif PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h52gif" -+ ) -+ -+list(APPEND _IMPORT_CHECK_TARGETS hdf5::h52gif ) -+list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h52gif "${_IMPORT_PREFIX}/bin/h52gif" ) -+ +# Import target "hdf5::hdf5_cpp-static" for configuration "" +set_property(TARGET hdf5::hdf5_cpp-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_cpp-static PROPERTIES @@ -518,7 +494,7 @@ +# Import target "hdf5::hdf5_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.4.1" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so.103.4.2" + IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.103" + ) + @@ -538,7 +514,7 @@ +# Import target "hdf5::hdf5_hl_cpp-shared" for configuration "" +set_property(TARGET hdf5::hdf5_hl_cpp-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) +set_target_properties(hdf5::hdf5_hl_cpp-shared PROPERTIES -+ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.7" ++ IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.so.100.1.8" + IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.100" + ) + diff --git a/hdf5-sh.patch b/hdf5-sh.patch index 44c5edd..45cc129 100644 --- a/hdf5-sh.patch +++ b/hdf5-sh.patch @@ -1,47 +1,47 @@ ---- hdf5-1.10.5/m4/aclocal_cxx.m4.orig 2018-09-04 04:54:44.000000000 +0200 -+++ hdf5-1.10.5/m4/aclocal_cxx.m4 2019-04-02 21:29:26.123178128 +0200 -@@ -26,7 +26,7 @@ +--- hdf5-1.10.10/m4/aclocal_cxx.m4.orig 2023-08-21 06:23:45.185096953 +0200 ++++ hdf5-1.10.10/m4/aclocal_cxx.m4 2023-08-21 06:24:56.672450942 +0200 +@@ -26,7 +26,7 @@ dnl have a [PAC] prefix. dnl Checking if C++ needs old style header files in includes AC_DEFUN([PAC_PROG_CXX_HEADERS],[ AC_MSG_CHECKING([if $CXX needs old style header files in includes]) -- TEST_SRC="`(echo \"#define OLD_HEADER_FILENAME 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" -+ TEST_SRC="$(echo "#define OLD_HEADER_FILENAME 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" +- TEST_SRC="`(echo \"#define OLD_HEADER_FILENAME 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define OLD_HEADER_FILENAME 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([no])], -@@ -38,7 +38,7 @@ +@@ -38,7 +38,7 @@ AC_DEFUN([PAC_PROG_CXX_HEADERS],[ dnl Checking if ++ can handle namespaces AC_DEFUN([PAC_PROG_CXX_NAMESPACE],[ AC_MSG_CHECKING([if $CXX can handle namespaces]) -- TEST_SRC="`(echo \"#define HDF_NO_NAMESPACE 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" -+ TEST_SRC="$(echo "#define HDF_NO_NAMESPACE 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" +- TEST_SRC="`(echo \"#define HDF_NO_NAMESPACE 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define HDF_NO_NAMESPACE 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) -@@ -49,7 +49,7 @@ +@@ -49,7 +49,7 @@ AC_DEFUN([PAC_PROG_CXX_NAMESPACE],[ dnl Checking if C++ supports std AC_DEFUN([PAC_PROG_CXX_STD],[ AC_MSG_CHECKING([if $CXX supports std]) -- TEST_SRC="`(echo \"#define HDF_NO_STD 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" -+ TEST_SRC="$(echo "#define HDF_NO_STD 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" +- TEST_SRC="`(echo \"#define HDF_NO_STD 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define HDF_NO_STD 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) -@@ -60,7 +60,7 @@ +@@ -60,7 +60,7 @@ AC_DEFUN([PAC_PROG_CXX_STD],[ dnl Checking if C++ has offsetof extension AC_DEFUN([PAC_PROG_CXX_OFFSETOF],[ AC_MSG_CHECKING([if $CXX has offsetof extension]) -- TEST_SRC="`(echo \"#define CXX_HAVE_OFFSETOF 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" -+ TEST_SRC="$(echo "#define CXX_HAVE_OFFSETOF 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" +- TEST_SRC="`(echo \"#define CXX_HAVE_OFFSETOF 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define CXX_HAVE_OFFSETOF 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])],[AC_MSG_RESULT([yes]) AC_DEFINE([CXX_HAVE_OFFSETOF], [1], [Define if C++ compiler recognizes offsetof])], -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ AC_DEFUN([PAC_PROG_CXX_OFFSETOF],[ dnl Checking if C++ can handle static cast AC_DEFUN([PAC_PROG_CXX_STATIC_CAST],[ AC_MSG_CHECKING([if $CXX can handle static cast]) -- TEST_SRC="`(echo \"#define NO_STATIC_CAST 1\"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)`" -+ TEST_SRC="$(echo "#define NO_STATIC_CAST 1"; cat $srcdir/config/cmake_ext_mod/HDFCXXTests.cpp)" +- TEST_SRC="`(echo \"#define NO_STATIC_CAST 1\"; cat $srcdir/config/cmake/HDFCXXTests.cpp)`" ++ TEST_SRC="$(echo "#define NO_STATIC_CAST 1"; cat $srcdir/config/cmake/HDFCXXTests.cpp)" AC_LINK_IFELSE([AC_LANG_SOURCE([$TEST_SRC])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) diff --git a/hdf5.spec b/hdf5.spec index 6ac7cad..78f586b 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -12,12 +12,12 @@ Summary: Hierarchical Data Format 5 library Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5) Name: hdf5 -Version: 1.10.9 -Release: 3 +Version: 1.10.10 +Release: 1 License: Nearly BSD, but changed sources must be marked Group: Libraries Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2 -# Source0-md5: 8f9eac14d3ee4719c3e4b52863ea42e9 +# Source0-md5: ea3078eca38884da6bb6d61575c236b3 Patch0: %{name}-sig.patch Patch1: %{name}-cmake.patch Patch2: %{name}-sh.patch @@ -511,8 +511,6 @@ rm -rf $RPM_BUILD_ROOT %files progs %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/gif2h5 -%attr(755,root,root) %{_bindir}/h52gif %attr(755,root,root) %{_bindir}/h5clear %attr(755,root,root) %{_bindir}/h5copy %attr(755,root,root) %{_bindir}/h5debug @@ -534,7 +532,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with java} %files -n java-hdf5 %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libhdf5_java.so.100.7.0 +%attr(755,root,root) %{_libdir}/libhdf5_java.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libhdf5_java.so.100 %attr(755,root,root) %{_libdir}/libhdf5_java.so %{_javadir}/jarhdf5-%{version}.jar -- 2.44.0