diff --git a/hdf/hdf.patch b/hdf/hdf.patch index 23a3f220f2..9c684a6cfd 100644 --- a/hdf/hdf.patch +++ b/hdf/hdf.patch @@ -1,32 +1,36 @@ Index: config/gnu-cxxflags ---- config/gnu-cxxflags.orig 2016-03-28 18:27:04.000000000 +0200 -+++ config/gnu-cxxflags 2016-11-17 23:00:29.186068369 +0100 -@@ -94,7 +94,7 @@ +--- config/gnu-cxxflags.orig 2018-01-25 20:11:38.120982000 +0100 ++++ config/gnu-cxxflags 2018-01-25 20:12:18.638110000 +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 -Waggregate-return -Wredundant-decls -Winline" +- 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 -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: config/gnu-flags ---- config/gnu-flags.orig 2016-03-28 18:27:04.000000000 +0200 -+++ config/gnu-flags 2016-11-17 23:00:51.866069598 +0100 -@@ -94,7 +94,7 @@ +--- config/gnu-flags.orig 2018-01-25 20:11:38.121445000 +0100 ++++ config/gnu-flags 2018-01-25 20:12:44.320954000 +0100 +@@ -92,7 +92,7 @@ esac # General -- H5_CFLAGS="$H5_CFLAGS $arch -std=c99 -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline" +- H5_CFLAGS="$H5_CFLAGS $arch -std=c99 -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs" + H5_CFLAGS="$H5_CFLAGS $arch -std=c99" # Production # NDEBUG is handled explicitly by the configure script Index: java/test/h5ex_g_iterate Index: src/H5FDdirect.c ---- src/H5FDdirect.c.orig 2016-03-28 18:26:25.000000000 +0200 -+++ src/H5FDdirect.c 2016-11-17 22:54:17.826074291 +0100 -@@ -486,7 +486,9 @@ +--- src/H5FDdirect.c.orig 2017-04-25 23:45:02.000000000 +0200 ++++ src/H5FDdirect.c 2018-01-25 20:11:38.121844000 +0100 +@@ -484,7 +484,9 @@ if (H5F_ACC_EXCL & flags) o_flags |= O_EXCL; /* Flag for Direct I/O */ diff --git a/hdf/hdf.spec b/hdf/hdf.spec index c8db214299..44d75eab5e 100644 --- a/hdf/hdf.spec +++ b/hdf/hdf.spec @@ -23,8 +23,7 @@ # package version %define V_major 5 -%define V_minor 1.10.0 -%define V_micro 1 +%define V_minor 1.10.1 # package information Name: hdf @@ -37,10 +36,10 @@ Class: EVAL Group: Libraries License: Open Source Version: %{V_major}.%{V_minor} -Release: 20170127 +Release: 20180125 # list of sources -Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf%{V_major}-%{V_minor}-patch%{V_micro}.tar.gz +Source0: ftp://ftp.hdfgroup.org/HDF5/current/src/hdf%{V_major}-%{V_minor}.tar.gz Patch0: hdf.patch # build information @@ -61,13 +60,13 @@ PreReq: zlib %track prog hdf = { - version = %{V_minor}-patch%{V_micro} - url = ftp://ftp.hdfgroup.org/HDF5/current/src/ - regex = hdf%{V_major}-(__VER__)\.tar\.gz + version = %{V_minor} + url = https://www.hdfgroup.org/downloads/hdf5/source-code/ + regex = HDF%{V_major}-(\d+\.\d+\.\d+) } %prep - %setup -q -n hdf%{V_major}-%{V_minor}-patch%{V_micro} + %setup -q -n hdf%{V_major}-%{V_minor} %patch -p0 %build