Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2018-09-24 13:13:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5" Mon Sep 24 13:13:19 2018 rev:47 rq:637100 version:1.10.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2018-06-25 11:38:53.521251619 +0200 +++ /work/SRC/openSUSE:Factory/.hdf5.new/hdf5.changes 2018-09-24 13:13:20.893697777 +0200 @@ -1,0 +2,16 @@ +Fri Sep 21 14:50:12 UTC 2018 - Stefan BrĂ¼ns <[email protected]> + +- Update to 1.10.3: + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.3/src/hdf5-1.10.3-RELEASE.txt +- Update to 1.10.2: + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.2/src/hdf5-1.10.2-RELEASE.txt +- Bump soversions (101 -> 103) for libhdf5 and libhdf5_cpp +- Drop Fix-warnings-for-missing-returns.patch, fixed upstream +- Add 0001-Fix-return-value-in-test_libver_bounds_open.patch +- Rebase patches (tab / space conversion): + * PPC64LE-Fix-long-double-handling.patch + * hdf5-buildcompare.patch + * hdf5-mpi.patch +- Rebase Disable-phdf5-tests.patch + +------------------------------------------------------------------- Old: ---- Fix-warnings-for-missing-returns.patch hdf5-1.10.1.tar.bz2 New: ---- 0001-Fix-return-value-in-test_libver_bounds_open.patch hdf5-1.10.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.3tvCAD/_old 2018-09-24 13:13:21.681696403 +0200 +++ /var/tmp/diff_new_pack.3tvCAD/_new 2018-09-24 13:13:21.685696396 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -28,8 +28,8 @@ %define _do_check 1 %define use_sz2 0 -%define vers 1.10.1 -%define _vers 1_10_1 +%define vers 1.10.3 +%define _vers 1_10_3 %define short_ver 1.10 %define src_ver %{version} %define pname hdf5 @@ -193,8 +193,8 @@ # TODO: The so numbers autodetected by update_so_version.sh # do not match the so numbers that are actually built. -%define sonum 101 -%define sonum_CXX 101 +%define sonum 103 +%define sonum_CXX 103 %define sonum_F 100 %define sonum_HL 100 %define sonum_HL_CXX 100 @@ -211,7 +211,6 @@ Source100: _multibuild Source1000: update_so_version.sh Patch0: hdf5-LD_LIBRARY_PATH.patch -Patch1: Fix-warnings-for-missing-returns.patch # not really needed but we want to get noticed if hdf5 doesn' t know our host Patch2: hdf5-1.8.11-abort_unknown_host_config.patch %ifarch %arm @@ -221,6 +220,7 @@ Patch6: hdf5-buildcompare.patch Patch7: hdf5-mpi.patch Patch8: Disable-phdf5-tests.patch +Patch9: 0001-Fix-return-value-in-test_libver_bounds_open.patch BuildRequires: fdupes %if 0%{?use_sz2} BuildRequires: libsz2-devel @@ -441,7 +441,6 @@ %{?with_hpc: %hpc_debug} %setup -q -n %{pname}-%{version} %patch0 -p1 -b .LD_LIBRARY_PATH -%patch1 -p1 %patch2 -p0 -b .abort_unknown_host_config %ifarch %arm %patch4 -p0 -b .tests-arm @@ -450,6 +449,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %if %{without hpc} # baselibs looks different for different flavors - generate it on the fly ++++++ 0001-Fix-return-value-in-test_libver_bounds_open.patch ++++++ >From b24bae35dcd2733e7339f87da0f2681ee06439a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Thu, 20 Sep 2018 20:36:13 +0200 Subject: [PATCH] Fix return value in test_libver_bounds_open A return value is neither returned nor expected. --- test/tfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tfile.c b/test/tfile.c index ad7f87f..d3134f8 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -4967,7 +4967,7 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, #define VERBFNAME "tverbounds_dspace.h5" #define VERBDSNAME "dataset 1" #define SPACE1_DIM1 3 -static int +static void test_libver_bounds_open(void) { hid_t file = -1; /* File ID */ -- 2.19.0 ++++++ Disable-phdf5-tests.patch ++++++ --- /var/tmp/diff_new_pack.3tvCAD/_old 2018-09-24 13:13:21.709696354 +0200 +++ /var/tmp/diff_new_pack.3tvCAD/_new 2018-09-24 13:13:21.709696354 +0200 @@ -19,11 +19,11 @@ ############################################################################## ############################################################################## --add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:testphdf5>) -+## add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:testphdf5>) +-add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS}) ++## add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS}) foreach (testp ${H5P_TESTS}) - add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:${testp}>) + add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${testp}> ${MPIEXEC_POSTFLAGS}) diff --git a/testpar/Makefile.am b/testpar/Makefile.am index b87c1df..27af0df 100644 --- a/testpar/Makefile.am @@ -32,8 +32,8 @@ # Test programs. These are our main targets. # --TEST_PROG_PARA=t_mpi testphdf5 t_cache t_cache_image t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame -+TEST_PROG_PARA=t_mpi t_cache t_cache_image t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame +-TEST_PROG_PARA=t_mpi t_bigio testphdf5 t_cache t_cache_image t_pflush1 t_pflush2 t_pread t_pshutdown t_prestart t_init_term t_shapesame t_filters_parallel ++TEST_PROG_PARA=t_mpi t_bigio t_cache t_cache_image t_pflush1 t_pflush2 t_pread t_pshutdown t_prestart t_init_term t_shapesame t_filters_parallel check_PROGRAMS = $(TEST_PROG_PARA) @@ -41,12 +41,12 @@ index ed26624..2f4bbe2 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in -@@ -778,7 +778,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 MPItest.h5 \ +@@ -799,7 +799,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 MPItest.h5 \ # Test programs. These are our main targets. # --TEST_PROG_PARA = t_mpi testphdf5 t_cache t_cache_image t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame -+TEST_PROG_PARA = t_mpi t_cache t_cache_image t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame +-TEST_PROG_PARA = t_mpi t_bigio testphdf5 t_cache t_cache_image t_pflush1 t_pflush2 t_pread t_pshutdown t_prestart t_init_term t_shapesame t_filters_parallel ++TEST_PROG_PARA = t_mpi t_bigio t_cache t_cache_image t_pflush1 t_pflush2 t_pread t_pshutdown t_prestart t_init_term t_shapesame t_filters_parallel testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_file_image.c t_mdset.c \ t_ph5basic.c t_coll_chunk.c t_span_tree.c t_chunk_alloc.c t_filter_read.c \ t_prop.c ++++++ PPC64LE-Fix-long-double-handling.patch ++++++ --- /var/tmp/diff_new_pack.3tvCAD/_old 2018-09-24 13:13:21.721696333 +0200 +++ /var/tmp/diff_new_pack.3tvCAD/_new 2018-09-24 13:13:21.721696333 +0200 @@ -15,7 +15,7 @@ index 082dbd4..9618a14 100644 --- a/config/cmake/ConversionTests.c +++ b/config/cmake/ConversionTests.c -@@ -23,6 +23,14 @@ int main(void) +@@ -34,6 +34,14 @@ int main(void) unsigned char s2[8]; int ret = 1; @@ -28,9 +28,9 @@ +#endif + if(sizeof(long double) == 16 && sizeof(long) == 8) { - /*make sure the long double type has 16 bytes in size and - * 11 bits of exponent. If it is, -@@ -146,6 +154,14 @@ int main(void) + /*make sure the long double type has 16 bytes in size and + * 11 bits of exponent. If it is, +@@ -157,6 +165,14 @@ int main(void) unsigned char s[16]; int ret = 0; @@ -59,7 +59,7 @@ + /* This happens for IBM long double in little endian. + The macro LDBL_MANT_DIG says 106 mantissa bits, but the + HDF5 detection code actually represents it as a normal 64bit -+ double (52 bit mantissa) with the upper double being ++ double (52 bit mantissa) with the upper double being + unspec bits (which is sort of okay as the testsuite + wouldn't deal with that format correctly anyway). So + override the mantissa size. */ @@ -79,7 +79,7 @@ + /* This happens for IBM long double in little endian. + The macro LDBL_MANT_DIG says 106 mantissa bits, but the + HDF5 detection code actually represents it as a normal 64bit -+ double (52 bit mantissa) with the upper double being ++ double (52 bit mantissa) with the upper double being + unspec bits (which is sort of okay as the testsuite + wouldn't deal with that format correctly anyway). So + override the mantissa size. */ ++++++ hdf5-1.10.1.tar.bz2 -> hdf5-1.10.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/hdf5/hdf5-1.10.1.tar.bz2 /work/SRC/openSUSE:Factory/.hdf5.new/hdf5-1.10.3.tar.bz2 differ: char 11, line 1 ++++++ hdf5-buildcompare.patch ++++++ --- /var/tmp/diff_new_pack.3tvCAD/_old 2018-09-24 13:13:21.769696249 +0200 +++ /var/tmp/diff_new_pack.3tvCAD/_new 2018-09-24 13:13:21.773696243 +0200 @@ -9,23 +9,23 @@ +++ hdf5-1.10.0-patch1/src/H5detect.c @@ -1311,18 +1311,6 @@ bit.\n"; printf("/* Generated automatically by H5detect -- do not edit */\n\n\n"); - HDputs(FileHeader); /*the copyright notice--see top of this file */ + HDputs(FileHeader); /*the copyright notice--see top of this file */ - printf(" *\n * Created:\t\t%s %2d, %4d\n", -- month_name[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year); +- month_name[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year); - if (pwd || real_name[0] || host_name[0]) { -- printf(" *\t\t\t"); -- if (real_name[0]) printf("%s <", real_name); +- printf(" *\t\t\t"); +- if (real_name[0]) printf("%s <", real_name); -#ifdef H5_HAVE_GETPWUID -- if (pwd) HDfputs(pwd->pw_name, stdout); +- if (pwd) HDfputs(pwd->pw_name, stdout); -#endif -- if (host_name[0]) printf("@%s", host_name); -- if (real_name[0]) printf(">"); -- HDputchar('\n'); +- if (host_name[0]) printf("@%s", host_name); +- if (real_name[0]) printf(">"); +- HDputchar('\n'); - } printf(" *\n * Purpose:\t\t"); for (s = purpose; *s; s++) { - HDputchar(*s); + HDputchar(*s); Index: hdf5-1.10.0-patch1/src/libhdf5.settings.in =================================================================== --- hdf5-1.10.0-patch1.orig/src/libhdf5.settings.in ++++++ hdf5-mpi.patch ++++++ --- /var/tmp/diff_new_pack.3tvCAD/_old 2018-09-24 13:13:21.781696229 +0200 +++ /var/tmp/diff_new_pack.3tvCAD/_new 2018-09-24 13:13:21.781696229 +0200 @@ -8,10 +8,10 @@ +#if 0 /* close file1 */ if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0) { - printf("H5Fget_vfd_handle for file1 failed\n"); + printf("H5Fget_vfd_handle for file1 failed\n"); @@ -189,14 +190,17 @@ main(int argc, char* argv[]) - printf("MPI_File_close for file2 failed\n"); - goto error; + printf("MPI_File_close for file2 failed\n"); + goto error; } /* end if */ +#endif
