- try to fix cmake config issues; release 2

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 0b683b4abfc6d208d33bd4cdf00390dbe7bcb8ce..79d03cd2b6fdaa95cd1dbba07619f7fef18a7f5b 100644 (file)
--- 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,217 @@
+@@ -0,0 +1,218 @@
 +# Generated by CMake
 +
 +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
@@ -84,6 +84,7 @@
 +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)
 +if(_IMPORT_PREFIX STREQUAL "/")
 +  set(_IMPORT_PREFIX "")
 +endif()

diff --git a/hdf5.spec b/hdf5.spec
index eaffa9364a625b58ddcaee833f1a9f0985f6532f..a1f3155cfcc617ff82d93ec24dfb8f57ec6d8c0f 100644 (file)
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -11,7 +11,7 @@ Summary:      Hierarchical Data Format 5 library
 Summary(pl.UTF-8):     Biblioteka HDF5 (Hierarchical Data Format 5)
 Name:          hdf5
 Version:       1.8.20
-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.8/hdf5-%{version}/src/%{name}-%{version}.tar.bz2
@@ -220,7 +220,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/cmake/hdf5
 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)
+vsubr=$(sed -ne 's/^#define H5_VERS_SUBRELEASE\s*"\?\([^" \t]\+\)"\?.*/\1/p' src/H5public.h)
 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@,,' \