From 4e79a51d3425d27bfce698a26e34f914a5ac46ff Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Fri, 9 Jul 2021 21:36:32 +0200 Subject: [PATCH] upgrading package: hdf 5.1.12.0 -> 5.1.12.1 --- hdf/hdf.patch | 26 +++++--------------------- hdf/hdf.spec | 9 +++++---- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/hdf/hdf.patch b/hdf/hdf.patch index ca5bd376eb..04f5c539ff 100644 --- a/hdf/hdf.patch +++ b/hdf/hdf.patch @@ -1,25 +1,9 @@ -Index: config/gnu-cxxflags ---- config/gnu-cxxflags.orig 2020-02-29 00:29:58.000000000 +0100 -+++ config/gnu-cxxflags 2020-03-04 08:06:01.249138000 +0100 -@@ -92,10 +92,10 @@ - esac - - # General (copied from H5_CFLAGS) -- H5_CXXFLAGS="$H5_CXXFLAGS $arch -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wredundant-decls -Winline" -+ H5_CXXFLAGS="$H5_CXXFLAGS $arch" - - # C++-specific -- H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-promo -Woverloaded-virtual -Wold-style-cast -Weffc++ -Wreorder -Wnon-virtual-dtor -Wctor-dtor-privacy -Wabi" -+ H5_CXXFLAGS="$H5_CXXFLAGS" - - # Production - # NDEBUG is handled explicitly by the configure script Index: java/test/h5ex_g_iterate Index: src/H5FDdirect.c ---- src/H5FDdirect.c.orig 2020-02-29 00:29:58.000000000 +0100 -+++ src/H5FDdirect.c 2020-03-04 08:06:01.249660000 +0100 -@@ -482,7 +482,9 @@ - if (H5F_ACC_EXCL & flags) o_flags |= O_EXCL; +--- src/H5FDdirect.c.orig 2021-07-01 23:26:41.000000000 +0200 ++++ src/H5FDdirect.c 2021-07-09 21:32:42.818403000 +0200 +@@ -479,7 +479,9 @@ + o_flags |= O_EXCL; /* Flag for Direct I/O */ +#ifdef O_DIRECT @@ -27,4 +11,4 @@ Index: src/H5FDdirect.c +#endif /* Open the file */ - if ((fd = HDopen(name, o_flags, H5_POSIX_CREATE_MODE_RW))<0) + if ((fd = HDopen(name, o_flags, H5_POSIX_CREATE_MODE_RW)) < 0) diff --git a/hdf/hdf.spec b/hdf/hdf.spec index 1dccf3fc21..30d9f040ef 100644 --- a/hdf/hdf.spec +++ b/hdf/hdf.spec @@ -23,8 +23,9 @@ # package version %define V_major 5 -%define V_minor 1.12.0 -%define V_subdir 1_12_0 +%define V_base 1.12 +%define V_minor 1.12.1 +%define V_subdir 1_12_1 # package information Name: hdf @@ -37,10 +38,10 @@ Class: EVAL Group: Libraries License: Open Source Version: %{V_major}.%{V_minor} -Release: 20200304 +Release: 20210709 # list of sources -Source0: https://s3.amazonaws.com/hdf-wordpress-1/wp-content/uploads/manual/HDF5/HDF%{V_major}_%{V_subdir}/source/hdf%{V_major}-%{V_minor}.tar.bz2 +Source0: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%{V_base}/hdf%{V_major}-%{V_minor}/src/hdf%{V_major}-%{V_minor}.tar.bz2 Patch0: hdf.patch # build information