- updated URL

- adjust PACKAGE_SHARE_INSTALL_DIR consistently
- updated HDF5_VERSION_MAJOR

diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index a1e76ef1aae9de0f5a2ce989d20830273d498c64..ff0a289fbdae6126697a076950a23207deb268e9 100644 (file)
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -26,15 +26,6 @@
  endif ()
  
  #-----------------------------------------------------------------------------
-@@ -118,7 +117,7 @@
-   if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
-     include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
-   endif ()
--  include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
-+  include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
- endif ()
- 
- # Handle default component(static) :
 @@ -208,7 +207,3 @@
      endif ()
    endforeach ()

diff --git a/hdf5.spec b/hdf5.spec
index 8d87eff6152fdd0e5f851a0d6310659e7a491c51..6ac7cad374b5e9a461bd467295094648c9763e2a 100644 (file)
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -21,7 +21,7 @@ Source0:      https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-%{version
 Patch0:                %{name}-sig.patch
 Patch1:                %{name}-cmake.patch
 Patch2:                %{name}-sh.patch
-URL:           https://support.hdfgroup.org/HDF5/
+URL:           https://www.hdfgroup.org/solutions/hdf5/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.11
 %{?with_s3:BuildRequires:      curl-devel}
@@ -271,7 +271,7 @@ for f in hdf5-config-version.cmake hdf5-config.cmake hdf5-targets.cmake hdf5-tar
        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," \
+           -e "s,@HDF5_VERSION_MAJOR@,1.10," \
            -e "s,@HDF5_VERSION_MINOR@,$vrel," \
            -e "s,@H5_VERS_MAJOR@,$vmajor," \
            -e "s,@H5_VERS_MINOR@,$vminor," \
@@ -302,7 +302,7 @@ for f in hdf5-config-version.cmake hdf5-config.cmake hdf5-targets.cmake hdf5-tar
            %{?with_mpi:-e 's,@MPI_C_INCLUDE_PATH@,%{_includedir},'} \
            %{?with_mpi:-e 's,@MPI_C_LIBRARIES@,%{_libdir},'} \
            -e 's,@PACKAGE_INCLUDE_INSTALL_DIR@,%{_includedir},' \
-           -e 's,@PACKAGE_SHARE_INSTALL_DIR@,%{_libdir}/cmake,' \
+           -e 's,@PACKAGE_SHARE_INSTALL_DIR@,%{_libdir}/cmake/hdf5,' \
            -e 's,@PACKAGE_CURRENT_BUILD_DIR@,%{_prefix},' \
                config/cmake/${f}.in > $RPM_BUILD_ROOT%{_libdir}/cmake/hdf5/$f
 done