commit 9c68a88fdb239e54fb092a194a691df45579b6a5
Author: Jan Palus <[email protected]>
Date: Sat Feb 18 15:10:25 2023 +0100
fix path to hdf5-targs.cmake; rel 2
hdf5-cmake.patch | 19 ++++++++++++++-----
hdf5.spec | 2 +-
2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index de1cdac..4a6485e 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -13,7 +13,7 @@ Summary: Hierarchical Data Format 5 library
Summary(pl.UTF-8): Biblioteka HDF5 (Hierarchical Data Format 5)
Name: hdf5
Version: 1.10.9
-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.10/hdf5-%{version}/src/%{name}-%{version}.tar.bz2
diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 5c77531..4f7e29b 100644
--- a/hdf5-cmake.patch
+++ b/hdf5-cmake.patch
@@ -1,5 +1,5 @@
---- 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
+--- hdf5-1.10.9/config/cmake/hdf5-config.cmake.in.orig 2022-05-19
05:31:38.000000000 +0200
++++ hdf5-1.10.9/config/cmake/hdf5-config.cmake.in 2023-02-18
15:06:15.857876492 +0100
@@ -12,7 +12,6 @@
#-----------------------------------------------------------------------------
# HDF5 Config file for compiling against hdf5 build/install directory
@@ -8,7 +8,7 @@
string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME)
-@@ -79,7 +78,7 @@
+@@ -81,7 +80,7 @@
set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@"
"${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_DIRS}")
set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
@@ -17,7 +17,7 @@
if (${HDF5_PACKAGE_NAME}_BUILD_CPP_LIB)
set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_CPP "@PACKAGE_INCLUDE_INSTALL_DIR@")
-@@ -95,7 +94,7 @@
+@@ -97,7 +96,7 @@
if (${HDF5_PACKAGE_NAME}_BUILD_TOOLS)
set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_TOOLS "@PACKAGE_INCLUDE_INSTALL_DIR@")
@@ -26,7 +26,16 @@
endif ()
#-----------------------------------------------------------------------------
-@@ -205,7 +204,3 @@
+@@ -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 ()
endforeach ()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf5.git/commitdiff/9c68a88fdb239e54fb092a194a691df45579b6a5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
