commit 58dfe6a9843f50552865ef53d30cb8397d9907f9 Author: Jan Palus <at...@pld-linux.org> Date: Fri Jun 25 16:30:46 2021 +0200
hack broken kealib-config; rel 2 wrongly interpretes hdf5 cmake config customized by us kealib-hdf5_libs.patch | 16 ++++++++++++++++ kealib.spec | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) --- diff --git a/kealib.spec b/kealib.spec index a02a958..4b8de5f 100644 --- a/kealib.spec +++ b/kealib.spec @@ -6,12 +6,13 @@ Summary: KEALib - HDF5 based raster file format library Summary(pl.UTF-8): KEALib - biblioteka rastrowego formatu plików opartego na HDF5 Name: kealib Version: 1.4.14 -Release: 1 +Release: 2 License: MIT Group: Libraries Source0: https://github.com/ubarsc/kealib/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz # Source0-md5: 494e9efc0c26f904c02c31fe2e668885 Patch0: %{name}-config.patch +Patch1: %{name}-hdf5_libs.patch URL: http://kealib.org/ BuildRequires: cmake >= 2.6.0 %{?with_gdal:BuildRequires: gdal-devel} @@ -77,6 +78,7 @@ Wtyczka KEA do biblioteki GDAL. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake . \ diff --git a/kealib-hdf5_libs.patch b/kealib-hdf5_libs.patch new file mode 100644 index 0000000..d05bb59 --- /dev/null +++ b/kealib-hdf5_libs.patch @@ -0,0 +1,16 @@ +--- kealib-1.4.14/CMakeLists.txt.orig 2020-11-27 02:19:08.000000000 +0100 ++++ kealib-1.4.14/CMakeLists.txt 2021-06-25 16:26:33.890160007 +0200 +@@ -139,9 +139,10 @@ + string(CONCAT HDF5_LIBRARIES_LIBTOOL ${HDF5_LIBRARIES_LIBTOOL} " -L" ${dir_name}) + endforeach(dir_name) + +-foreach(lib_name ${HDF5_LIBRARIES_NAMES}) +- string(CONCAT HDF5_LIBRARIES_LIBTOOL ${HDF5_LIBRARIES_LIBTOOL} " -l" ${lib_name}) +-endforeach(lib_name) ++#foreach(lib_name ${HDF5_LIBRARIES_NAMES}) ++# string(CONCAT HDF5_LIBRARIES_LIBTOOL ${HDF5_LIBRARIES_LIBTOOL} " -l" ${lib_name}) ++#endforeach(lib_name) ++set(HDF5_LIBRARIES_LIBTOOL " -lhdf5_cpp -lhdf5_hl_cpp ") + message(STATUS "HDF5_LIBRARIES_LIBTOOL ${HDF5_LIBRARIES_LIBTOOL}") + + set(HDF5_INCLUDE_LIBTOOL) ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kealib.git/commitdiff/58dfe6a9843f50552865ef53d30cb8397d9907f9 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit