[packages/h5augjpss] - fix hdf5 detection in non-plain lib/

baggins baggins at pld-linux.org
Sun Dec 8 23:28:45 CET 2019


commit ba9e7ace20f8c2766b58dc09cfd6bbf901b6bea2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 8 23:28:12 2019 +0100

    - fix hdf5 detection in non-plain lib/

 h5augjpss.spec |  2 ++
 libdir.patch   | 11 +++++++++++
 2 files changed, 13 insertions(+)
---
diff --git a/h5augjpss.spec b/h5augjpss.spec
index 50f16da..4a9ba9b 100644
--- a/h5augjpss.spec
+++ b/h5augjpss.spec
@@ -8,6 +8,7 @@ License:	BSD-like, changed sources must be marked
 Source0:	http://www.hdfgroup.org/ftp/HDF5/projects/jpss/h5augjpss/%{name}-%{version}.tar.gz
 # Source0-md5:	5435f4dee00fcc8bbe30d9bed421c812
 Patch0:		%{name}-cmake.patch
+Patch1:		libdir.patch
 URL:		http://www.hdfgroup.org/projects/npoess/h5augjpss_index.html
 BuildRequires:	hdf5-devel >= 1.8
 BuildRequires:	libxml2-devel
@@ -36,6 +37,7 @@ programu h5edit lub HDFView.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %cmake .
diff --git a/libdir.patch b/libdir.patch
new file mode 100644
index 0000000..2710c73
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,11 @@
+--- h5augjpss-1.0.0/config/cmake/FindHDF5.cmake~	2011-06-23 19:48:48.000000000 +0200
++++ h5augjpss-1.0.0/config/cmake/FindHDF5.cmake	2019-12-08 23:26:04.751949531 +0100
+@@ -63,7 +63,7 @@
+     HINTS ${_HDF5_HINTS}
+     PATHS ${_HDF5_PATHS}
+     PATH_SUFFIXES
+-        lib/cmake/hdf5
++        lib${LIB_SUFFIX}/cmake/hdf5
+         share/cmake/hdf5
+ )
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/h5augjpss.git/commitdiff/ba9e7ace20f8c2766b58dc09cfd6bbf901b6bea2



More information about the pld-cvs-commit mailing list