From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 9 May 2018 19:03:11 +0000 (+0200)
Subject: - new URLs, updated to 1.8.20 (note: new libhdf5_cpp soname)
X-Git-Tag: auto/th/hdf5-1.8.20-1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=07607a681062ebba18cc9928caa96f1ae75bb730;p=packages%2Fhdf5.git

- new URLs, updated to 1.8.20 (note: new libhdf5_cpp soname)
- updated sig,cmake patches
---

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 4054671..0b683b4 100644
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -1,174 +1,548 @@
---- hdf5-1.8.10-patch1/config/cmake/hdf5-targets.cmake.in.orig	1970-01-01 01:00:00.000000000 +0100
-+++ hdf5-1.8.10-patch1/config/cmake/hdf5-targets.cmake.in	2013-04-02 18:10:51.166052034 +0200
-@@ -0,0 +1,39 @@
-+# Generated by CMake 2.8.10.2
-+
-+IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
-+   MESSAGE(FATAL_ERROR "CMake >= 2.6.0 required")
-+ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
-+CMAKE_POLICY(PUSH)
-+CMAKE_POLICY(VERSION 2.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 @@
+ #-----------------------------------------------------------------------------
+ # HDF5 Config file for compiling against hdf5 build/install directory
+ #-----------------------------------------------------------------------------
+-@PACKAGE_INIT@
+ 
+ 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}")
+ 
+ set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
+-set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
++set (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
+ 
+ if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB)
+   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@")
+@@ -63,7 +62,7 @@
+ 
+ if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS)
+   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@")
+-  set_and_check (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
++  set (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
+ endif ()
+ 
+ #-----------------------------------------------------------------------------
+@@ -154,7 +153,3 @@
+     endif ()
+   endforeach ()
+ endforeach ()
+-
+-foreach (libtype IN LISTS ${HDF5_PACKAGE_NAME}_LIB_TYPE)
+-  check_required_components(${HDF5_PACKAGE_NAME}_${libtype})
+-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,217 @@
++# Generated by CMake
++
++if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
++   message(FATAL_ERROR "CMake >= 2.6.0 required")
++endif()
++cmake_policy(PUSH)
++cmake_policy(VERSION 2.6)
 +#----------------------------------------------------------------
 +# Generated CMake target import file.
 +#----------------------------------------------------------------
 +
 +# Commands may need to know the format version.
-+SET(CMAKE_IMPORT_FILE_VERSION 1)
++set(CMAKE_IMPORT_FILE_VERSION 1)
++
++# Protect against multiple inclusion, which would fail when already imported targets are added once more.
++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)
++  list(APPEND _expectedTargets ${_expectedTarget})
++  if(NOT TARGET ${_expectedTarget})
++    list(APPEND _targetsNotDefined ${_expectedTarget})
++  endif()
++  if(TARGET ${_expectedTarget})
++    list(APPEND _targetsDefined ${_expectedTarget})
++  endif()
++endforeach()
++if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
++  unset(_targetsDefined)
++  unset(_targetsNotDefined)
++  unset(_expectedTargets)
++  set(CMAKE_IMPORT_FILE_VERSION)
++  cmake_policy(POP)
++  return()
++endif()
++if(NOT "${_targetsDefined}" STREQUAL "")
++  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
++endif()
++unset(_targetsDefined)
++unset(_targetsNotDefined)
++unset(_expectedTargets)
++
++
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
++# Create imported target hdf5::hdf5-static
++add_library(hdf5::hdf5-static STATIC IMPORTED)
++
++set_target_properties(hdf5::hdf5-static PROPERTIES
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:m>;\$<LINK_ONLY:dl>;dl"
++)
++
++# Create imported target hdf5::hdf5-shared
++add_library(hdf5::hdf5-shared SHARED IMPORTED)
++
++set_target_properties(hdf5::hdf5-shared PROPERTIES
++  INTERFACE_COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB=1"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "dl"
++)
++
++# Create imported target hdf5::hdf5_tools-static
++add_library(hdf5::hdf5_tools-static STATIC IMPORTED)
++
++set_target_properties(hdf5::hdf5_tools-static PROPERTIES
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static"
++)
++
++# Create imported target hdf5::hdf5_tools-shared
++add_library(hdf5::hdf5_tools-shared SHARED IMPORTED)
++
++set_target_properties(hdf5::hdf5_tools-shared PROPERTIES
++  INTERFACE_COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB=1"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared"
++)
 +
-+# Create imported target hdf5
-+ADD_LIBRARY(hdf5 STATIC IMPORTED)
++# Create imported target hdf5::h5diff
++add_executable(hdf5::h5diff IMPORTED)
 +
-+# Create imported target hdf5_hl
-+ADD_LIBRARY(hdf5_hl STATIC IMPORTED)
++# Create imported target hdf5::h5diff-shared
++add_executable(hdf5::h5diff-shared IMPORTED)
 +
-+# Create imported target hdf5_f90cstub
-+ADD_LIBRARY(hdf5_f90cstub STATIC IMPORTED)
++# Create imported target hdf5::h5ls
++add_executable(hdf5::h5ls IMPORTED)
 +
-+# Create imported target hdf5_fortran
-+ADD_LIBRARY(hdf5_fortran STATIC IMPORTED)
++# Create imported target hdf5::h5ls-shared
++add_executable(hdf5::h5ls-shared IMPORTED)
 +
-+# Create imported target hdf5_cpp
-+ADD_LIBRARY(hdf5_cpp STATIC IMPORTED)
++# Create imported target hdf5::h5debug
++add_executable(hdf5::h5debug IMPORTED)
++
++# Create imported target hdf5::h5repart
++add_executable(hdf5::h5repart IMPORTED)
++
++# Create imported target hdf5::h5mkgrp
++add_executable(hdf5::h5mkgrp IMPORTED)
++
++# Create imported target hdf5::h5import
++add_executable(hdf5::h5import IMPORTED)
++
++# Create imported target hdf5::h5repack
++add_executable(hdf5::h5repack IMPORTED)
++
++# Create imported target hdf5::h5repack-shared
++add_executable(hdf5::h5repack-shared IMPORTED)
++
++# Create imported target hdf5::h5jam
++add_executable(hdf5::h5jam IMPORTED)
++
++# Create imported target hdf5::h5unjam
++add_executable(hdf5::h5unjam IMPORTED)
++
++# Create imported target hdf5::h5copy
++add_executable(hdf5::h5copy IMPORTED)
++
++# Create imported target hdf5::h5copy-shared
++add_executable(hdf5::h5copy-shared IMPORTED)
++
++# Create imported target hdf5::h5stat
++add_executable(hdf5::h5stat IMPORTED)
++
++# Create imported target hdf5::h5stat-shared
++add_executable(hdf5::h5stat-shared IMPORTED)
++
++# Create imported target hdf5::h5dump
++add_executable(hdf5::h5dump IMPORTED)
++
++# Create imported target hdf5::h5dump-shared
++add_executable(hdf5::h5dump-shared IMPORTED)
++
++# Create imported target hdf5::hdf5_hl-static
++add_library(hdf5::hdf5_hl-static STATIC IMPORTED)
++
++set_target_properties(hdf5::hdf5_hl-static PROPERTIES
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static"
++)
++
++# Create imported target hdf5::hdf5_hl-shared
++add_library(hdf5::hdf5_hl-shared SHARED IMPORTED)
++
++set_target_properties(hdf5::hdf5_hl-shared PROPERTIES
++  INTERFACE_COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB=1"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  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)
++
++set_target_properties(hdf5::hdf5_cpp-static PROPERTIES
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static"
++)
++
++# Create imported target hdf5::hdf5_cpp-shared
++add_library(hdf5::hdf5_cpp-shared SHARED IMPORTED)
++
++set_target_properties(hdf5::hdf5_cpp-shared PROPERTIES
++  INTERFACE_COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB=1"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared"
++)
++
++# Create imported target hdf5::hdf5_hl_cpp-static
++add_library(hdf5::hdf5_hl_cpp-static STATIC IMPORTED)
++
++set_target_properties(hdf5::hdf5_hl_cpp-static PROPERTIES
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "hdf5::hdf5_hl-static;hdf5::hdf5-static"
++)
++
++# Create imported target hdf5::hdf5_hl_cpp-shared
++add_library(hdf5::hdf5_hl_cpp-shared SHARED IMPORTED)
++
++set_target_properties(hdf5::hdf5_hl_cpp-shared PROPERTIES
++  INTERFACE_COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB=1"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++  INTERFACE_LINK_LIBRARIES "hdf5::hdf5_hl-shared;hdf5::hdf5-shared"
++)
++
++if(CMAKE_VERSION VERSION_LESS 2.8.12)
++  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
++endif()
 +
 +# Load information for each installed configuration.
-+GET_FILENAME_COMPONENT(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-+FILE(GLOB CONFIG_FILES "${_DIR}/hdf5-targets-*.cmake")
-+FOREACH(f ${CONFIG_FILES})
-+  INCLUDE(${f})
-+ENDFOREACH(f)
++get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
++file(GLOB CONFIG_FILES "${_DIR}/hdf5-targets-*.cmake")
++foreach(f ${CONFIG_FILES})
++  include(${f})
++endforeach()
++
++# Cleanup temporary variables.
++set(_IMPORT_PREFIX)
++
++
++# This file does not depend on other imported targets which have
++# been exported from the same project but in a separate export set.
 +
 +# Commands beyond this point should not need to know the version.
-+SET(CMAKE_IMPORT_FILE_VERSION)
-+CMAKE_POLICY(POP)
---- hdf5-1.8.10-patch1/config/cmake/hdf5-targets-noconfig.cmake.in.orig	1970-01-01 01:00:00.000000000 +0100
-+++ hdf5-1.8.10-patch1/config/cmake/hdf5-targets-noconfig.cmake.in	2013-04-02 18:12:17.399383569 +0200
-@@ -0,0 +1,93 @@
++set(CMAKE_IMPORT_FILE_VERSION)
++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 @@
 +#----------------------------------------------------------------
-+# Generated CMake target import file for configuration "".
++# Generated CMake target import file.
 +#----------------------------------------------------------------
 +
 +# Commands may need to know the format version.
-+SET(CMAKE_IMPORT_FILE_VERSION 1)
++set(CMAKE_IMPORT_FILE_VERSION 1)
 +
-+# Compute the installation prefix relative to this file.
-+GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-+GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-+GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++# Import target "hdf5::hdf5-static" for configuration ""
++set_property(TARGET hdf5::hdf5-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::hdf5-static PROPERTIES
++  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "C"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.a"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5-static )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5-static "${_IMPORT_PREFIX}/@lib@/libhdf5.a" )
 +
-+# Make sure the targets which have been exported in some other 
-+# export set exist.
++# 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.1.8.20"
++  IMPORTED_SONAME_NOCONFIG "libhdf5.so.10.3.1"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5-shared )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5-shared "${_IMPORT_PREFIX}/@lib@/libhdf5.so.1.8.20" )
 +
-+# Import target "hdf5" for configuration ""
-+SET_PROPERTY(TARGET hdf5 APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-+SET_TARGET_PROPERTIES(hdf5 PROPERTIES
++# Import target "hdf5::hdf5_tools-static" for configuration ""
++set_property(TARGET hdf5::hdf5_tools-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::hdf5_tools-static PROPERTIES
 +  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "C"
-+  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "m;sz"
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5.so"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_tools.a"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_tools-static )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_tools-static "${_IMPORT_PREFIX}/lib/libhdf5_tools-static.a" )
++
++# 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.1.8.20"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_tools.so.10.3.1"
++  )
++
++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.1.8.20" )
++
++# Import target "hdf5::h5diff" for configuration ""
++set_property(TARGET hdf5::h5diff APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5diff PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5diff"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5diff )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5diff "${_IMPORT_PREFIX}/bin/h5diff" )
++
++# Import target "hdf5::h5diff-shared" for configuration ""
++set_property(TARGET hdf5::h5diff-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5diff-shared PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5diff-shared"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5diff-shared )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5diff-shared "${_IMPORT_PREFIX}/bin/h5diff-shared" )
++
++# Import target "hdf5::h5ls" for configuration ""
++set_property(TARGET hdf5::h5ls APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5ls PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5ls"
 +  )
 +
-+LIST(APPEND _IMPORT_CHECK_TARGETS hdf5 )
-+LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5 "${_IMPORT_PREFIX}/@lib@/libhdf5.so" )
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5ls )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5ls "${_IMPORT_PREFIX}/bin/h5ls" )
++
++# Import target "hdf5::h5ls-shared" for configuration ""
++set_property(TARGET hdf5::h5ls-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5ls-shared PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5ls-shared"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5ls-shared )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5ls-shared "${_IMPORT_PREFIX}/bin/h5ls-shared" )
++
++# Import target "hdf5::h5debug" for configuration ""
++set_property(TARGET hdf5::h5debug APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5debug PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5debug"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5debug )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5debug "${_IMPORT_PREFIX}/bin/h5debug" )
++
++# Import target "hdf5::h5repart" for configuration ""
++set_property(TARGET hdf5::h5repart APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5repart PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5repart"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5repart )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5repart "${_IMPORT_PREFIX}/bin/h5repart" )
++
++# Import target "hdf5::h5mkgrp" for configuration ""
++set_property(TARGET hdf5::h5mkgrp APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5mkgrp PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5mkgrp"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5mkgrp )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5mkgrp "${_IMPORT_PREFIX}/bin/h5mkgrp" )
++
++# Import target "hdf5::h5import" for configuration ""
++set_property(TARGET hdf5::h5import APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5import PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5import"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5import )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5import "${_IMPORT_PREFIX}/bin/h5import" )
++
++# Import target "hdf5::h5repack" for configuration ""
++set_property(TARGET hdf5::h5repack APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5repack PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5repack"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5repack )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5repack "${_IMPORT_PREFIX}/bin/h5repack" )
++
++# Import target "hdf5::h5repack-shared" for configuration ""
++set_property(TARGET hdf5::h5repack-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5repack-shared PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5repack-shared"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5repack-shared )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5repack-shared "${_IMPORT_PREFIX}/bin/h5repack-shared" )
++
++# Import target "hdf5::h5jam" for configuration ""
++set_property(TARGET hdf5::h5jam APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5jam PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5jam"
++  )
 +
-+# Make sure the targets which have been exported in some other 
-+# export set exist.
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5jam )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5jam "${_IMPORT_PREFIX}/bin/h5jam" )
 +
-+# Import target "hdf5_hl" for configuration ""
-+SET_PROPERTY(TARGET hdf5_hl APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-+SET_TARGET_PROPERTIES(hdf5_hl PROPERTIES
++# Import target "hdf5::h5unjam" for configuration ""
++set_property(TARGET hdf5::h5unjam APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5unjam PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5unjam"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5unjam )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5unjam "${_IMPORT_PREFIX}/bin/h5unjam" )
++
++# Import target "hdf5::h5copy" for configuration ""
++set_property(TARGET hdf5::h5copy APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5copy PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5copy"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5copy )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5copy "${_IMPORT_PREFIX}/bin/h5copy" )
++
++# Import target "hdf5::h5copy-shared" for configuration ""
++set_property(TARGET hdf5::h5copy-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5copy-shared PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5copy-shared"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5copy-shared )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5copy-shared "${_IMPORT_PREFIX}/bin/h5copy-shared" )
++
++# Import target "hdf5::h5stat" for configuration ""
++set_property(TARGET hdf5::h5stat APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5stat PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5stat"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5stat )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5stat "${_IMPORT_PREFIX}/bin/h5stat" )
++
++# Import target "hdf5::h5stat-shared" for configuration ""
++set_property(TARGET hdf5::h5stat-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5stat-shared PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5stat-shared"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5stat-shared )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5stat-shared "${_IMPORT_PREFIX}/bin/h5stat-shared" )
++
++# Import target "hdf5::h5dump" for configuration ""
++set_property(TARGET hdf5::h5dump APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5dump PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5dump"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5dump )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5dump "${_IMPORT_PREFIX}/bin/h5dump" )
++
++# Import target "hdf5::h5dump-shared" for configuration ""
++set_property(TARGET hdf5::h5dump-shared APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::h5dump-shared PROPERTIES
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/bin/h5dump-shared"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h5dump-shared )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h5dump-shared "${_IMPORT_PREFIX}/bin/h5dump-shared" )
++
++# Import target "hdf5::hdf5_hl-static" for configuration ""
++set_property(TARGET hdf5::hdf5_hl-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::hdf5_hl-static PROPERTIES
 +  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "C"
-+  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "m;sz"
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.a"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl-static )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl-static "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.a" )
++
++# 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.1.8.20"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_hl.so.10.3.1"
 +  )
 +
-+#LIST(APPEND _IMPORT_CHECK_TARGETS hdf5_hl )
-+LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5_hl "${_IMPORT_PREFIX}/@lib@/libhdf5_hl.so" )
++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.1.8.20" )
 +
-+# Make sure the targets which have been exported in some other 
-+# export set exist.
++# 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_fortran" for configuration ""
-+SET_PROPERTY(TARGET hdf5_fortran APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-+SET_TARGET_PROPERTIES(hdf5_fortran PROPERTIES
-+  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "Fortran"
-+  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "hdf5_f90cstub;hdf5"
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_fortran.so"
++# 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_fortran )
-+LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5_fortran "${_IMPORT_PREFIX}/@lib@/libhdf5_fortran.so" )
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::h52gif )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::h52gif "${_IMPORT_PREFIX}/bin/h52gif" )
 +
-+# Make sure the targets which have been exported in some other 
-+# export set exist.
++# 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
++  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.a"
++  )
++
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_cpp-static )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_cpp-static "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.a" )
++
++# 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.1.8.20"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_cpp.so.10.3.1"
++  )
 +
-+# Import target "hdf5_cpp" for configuration ""
-+SET_PROPERTY(TARGET hdf5_cpp APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
-+SET_TARGET_PROPERTIES(hdf5_cpp PROPERTIES
++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.1.8.20" )
++
++# Import target "hdf5::hdf5_hl_cpp-static" for configuration ""
++set_property(TARGET hdf5::hdf5_hl_cpp-static APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
++set_target_properties(hdf5::hdf5_hl_cpp-static PROPERTIES
 +  IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
-+  IMPORTED_LINK_INTERFACE_LIBRARIES_NOCONFIG "hdf5"
-+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so"
-+  )
-+
-+#LIST(APPEND _IMPORT_CHECK_TARGETS hdf5_cpp )
-+LIST(APPEND _IMPORT_CHECK_FILES_FOR_hdf5_cpp "${_IMPORT_PREFIX}/@lib@/libhdf5_cpp.so" )
-+
-+# Loop over all imported files and verify that they actually exist
-+FOREACH(target ${_IMPORT_CHECK_TARGETS} )
-+  FOREACH(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
-+    IF(NOT EXISTS "${file}" )
-+      MESSAGE(FATAL_ERROR "The imported target \"${target}\" references the file
-+   \"${file}\"
-+but this file does not exist.  Possible reasons include:
-+* The file was deleted, renamed, or moved to another location.
-+* An install or uninstall procedure did not complete successfully.
-+* The installation package was faulty and contained
-+   \"${CMAKE_CURRENT_LIST_FILE}\"
-+but not all the files it references.
-+")
-+    ENDIF()
-+  ENDFOREACH()
-+  UNSET(_IMPORT_CHECK_FILES_FOR_${target})
-+ENDFOREACH()
-+UNSET(_IMPORT_CHECK_TARGETS)
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@lib@/libhdf5_hl_cpp.a"
++  )
 +
-+# Cleanup temporary variables.
-+SET(_IMPORT_PREFIX)
++list(APPEND _IMPORT_CHECK_TARGETS hdf5::hdf5_hl_cpp-static )
++list(APPEND _IMPORT_CHECK_FILES_FOR_hdf5::hdf5_hl_cpp-static "${_IMPORT_PREFIX}/lib/libhdf5_hl_cpp-static.a" )
++
++# 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.1.8.20"
++  IMPORTED_SONAME_NOCONFIG "libhdf5_hl_cpp.so.10.3.1"
++  )
++
++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.1.8.20" )
 +
 +# Commands beyond this point should not need to know the version.
-+SET(CMAKE_IMPORT_FILE_VERSION)
---- 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 @@
- #-----------------------------------------------------------------------------
- # HDF5 Config file for compiling against hdf5 build/install directory
- #-----------------------------------------------------------------------------
--@PACKAGE_INIT@
- 
- 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}")
- 
- set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
--set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
-+set (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
- 
- if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB)
-   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@")
-@@ -63,7 +62,7 @@
- 
- if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS)
-   set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@")
--  set_and_check (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
-+  set (${HDF5_PACKAGE_NAME}_TOOLS_DIR "@PACKAGE_CURRENT_BUILD_DIR@/bin")
- endif ()
- 
- #-----------------------------------------------------------------------------
-@@ -154,7 +153,3 @@
-     endif ()
-   endforeach ()
- endforeach ()
--
--foreach (libtype IN LISTS ${HDF5_PACKAGE_NAME}_LIB_TYPE)
--  check_required_components(${HDF5_PACKAGE_NAME}_${libtype})
--endforeach ()
++set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/hdf5-sig.patch b/hdf5-sig.patch
index 10469e9..b6c3c67 100644
--- a/hdf5-sig.patch
+++ b/hdf5-sig.patch
@@ -1,12 +1,13 @@
---- hdf5-1.8.15/configure.ac.orig	2015-05-20 17:40:38.246732231 +0200
-+++ hdf5-1.8.15/configure.ac	2015-05-20 17:41:46.156729379 +0200
-@@ -1643,10 +1643,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 getpwuid getrusage gettimeofday])
+ AC_CHECK_FUNCS([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])
  
 +dnl cannot be detected in glibc by plain AC_CHECK_FUNCS
diff --git a/hdf5.spec b/hdf5.spec
index 7309cbd..eaffa93 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -10,16 +10,16 @@
 Summary:	Hierarchical Data Format 5 library
 Summary(pl.UTF-8):	Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:		hdf5
-Version:	1.8.17
-Release:	2
+Version:	1.8.20
+Release:	1
 License:	Nearly BSD, but changed sources must be marked
 Group:		Libraries
-Source0:	ftp://ftp.hdfgroup.org/HDF5/current/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	34bd1afa5209259201a41964100d6203
+Source0:	https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	23078d57975903e9536d1e7b299cc39c
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-sig.patch
 Patch2:		%{name}-cmake.patch
-URL:		http://www.hdfgroup.org/HDF5/
+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}
@@ -221,8 +221,8 @@ vmajor=$(sed -ne 's/^#define H5_VERS_MAJOR\s*\([0-9]\+\).*/\1/p' src/H5public.h)
 vminor=$(sed -ne 's/^#define H5_VERS_MINOR\s*\([0-9]\+\).*/\1/p' src/H5public.h)
 vrel=$(sed -ne 's/^#define H5_VERS_RELEASE\s*\([0-9]\+\).*/\1/p' src/H5public.h)
 vsubr=$(sed -ne 's/^#define H5_VERS_SUBRELEASE\s*\([^ \t]\+\).*/\1/p' src/H5public.h)
-for f in FindHDF5.cmake hdf5-config-version.cmake hdf5-config.cmake hdf5-targets.cmake hdf5-targets-noconfig.cmake ; do
-	sed -e 's,@HDF5_PACKAGE@,hdf5,' \
+for f in hdf5-config-version.cmake hdf5-config.cmake hdf5-targets.cmake hdf5-targets-noconfig.cmake ; do
+	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," \
@@ -252,6 +252,7 @@ for f in FindHDF5.cmake hdf5-config-version.cmake hdf5-config.cmake hdf5-targets
 	    -e 's,@ZLIB_PACKAGE_NAME@,zlib,' \
 	    -e 's,@SZIP_PACKAGE_NAME@,szip,' \
 	    -e 's,@HDF5_LIBRARIES_TO_EXPORT@,hdf5,' \
+	    -e 's,@CMAKE_GENERATOR_TOOLSET@,,' \
 	    -e 's,@lib@,%{_lib},' \
 	    %{?with_mpi:-e 's,@MPI_C_INCLUDE_PATH@,%{_includedir},'} \
 	    %{?with_mpi:-e 's,@MPI_C_LIBRARIES@,%{_libdir},'} \
@@ -351,7 +352,7 @@ 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.12
+%attr(755,root,root) %ghost %{_libdir}/libhdf5_cpp.so.15
 %attr(755,root,root) %{_libdir}/libhdf5_hl_cpp.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libhdf5_hl_cpp.so.11
 
@@ -385,6 +386,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/H5Group.h
 %{_includedir}/H5IdComponent.h
 %{_includedir}/H5IntType.h
+%{_includedir}/H5LaccProp.h
 %{_includedir}/H5Library.h
 %{_includedir}/H5Location.h
 %{_includedir}/H5Object.h