- fix hdf5 detection in non-plain lib/

diff --git a/h5augjpss.spec b/h5augjpss.spec
index 50f16dabbe133ce5673189b81230a79b42df5b3a..4a9ba9bb4c4c88093ea89469fc694a5d31a60d4e 100644 (file)
--- 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 (file)
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}\r
+     PATHS ${_HDF5_PATHS}\r
+     PATH_SUFFIXES\r
+-        lib/cmake/hdf5\r
++        lib${LIB_SUFFIX}/cmake/hdf5\r
+         share/cmake/hdf5\r
+ )\r
+ \r