[packages/hdf5] - try to fix cmake config issues; release 2
qboosh
qboosh at pld-linux.org
Thu May 17 21:32:51 CEST 2018
commit 9e421fac8768352ca7b8d5338f09de0256cb46c4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu May 17 21:33:41 2018 +0200
- try to fix cmake config issues; release 2
hdf5-cmake.patch | 3 ++-
hdf5.spec | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/hdf5.spec b/hdf5.spec
index eaffa93..a1f3155 100644
--- 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, at HDF5_PACKAGE@,hdf5,g' \
-e 's, at HDF_PACKAGE_EXT@,,' \
diff --git a/hdf5-cmake.patch b/hdf5-cmake.patch
index 0b683b4..79d03cd 100644
--- 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()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf5.git/commitdiff/9e421fac8768352ca7b8d5338f09de0256cb46c4
More information about the pld-cvs-commit
mailing list