commit 78d57859909ccc1d3749019eb8a50f4d6a8733e1
Author: Jakub Bogusz <[email protected]>
Date: Wed Mar 15 22:11:15 2023 +0100
- updated URL
- adjust PACKAGE_SHARE_INSTALL_DIR consistently
- updated HDF5_VERSION_MAJOR
hdf5-cmake.patch | 9 ---------
hdf5.spec | 6 +++---
2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index 8d87eff..6ac7cad 100644
--- 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
diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index a1e76ef..ff0a289 100644
--- 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@@[email protected])
- endif ()
-- include
(@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@[email protected])
-+ include
(@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@[email protected])
- endif ()
-
- # Handle default component(static) :
@@ -208,7 +207,3 @@
endif ()
endforeach ()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf5.git/commitdiff/78d57859909ccc1d3749019eb8a50f4d6a8733e1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
