From 78e7ea8a32bf678908a6ab4617fd69f7bb40f744ca320e1e990b863174edddc8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 28 Apr 2022 21:54:17 +0000 Subject: [PATCH] Accepting request 970387 from home:jngrad:branches:devel:languages:python:numeric Fixed bug #1198352 OBS-URL: https://build.opensuse.org/request/show/970387 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python3-espressomd?expand=0&rev=30 --- hdf5.patch | 14 ++++++++++++++ python3-espressomd.changes | 12 ++++++++++++ python3-espressomd.spec | 10 ++++++++-- rpath.patch | 13 +++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 hdf5.patch create mode 100644 rpath.patch diff --git a/hdf5.patch b/hdf5.patch new file mode 100644 index 0000000..ef24fc5 --- /dev/null +++ b/hdf5.patch @@ -0,0 +1,14 @@ +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index c956b9de1..b68208eaa 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -189,6 +189,9 @@ endif(SCAFACOS) + # Subdirectories + add_subdirectory(io) + ++if(H5MD) ++ target_link_libraries(EspressoCore PUBLIC ${HDF5_LIBRARIES}) ++endif(H5MD) + + if(WITH_UNIT_TESTS) + add_subdirectory(unit_tests) diff --git a/python3-espressomd.changes b/python3-espressomd.changes index 7a5dcbd..c309895 100644 --- a/python3-espressomd.changes +++ b/python3-espressomd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Apr 16 00:24:21 UTC 2022 - Jean-Noel Grad + +- added rpath.patch to fix the failing Rpath checks (see + boo#1198352) + +------------------------------------------------------------------- +Sat Apr 16 00:19:40 UTC 2022 - Jean-Noel Grad + +- added hdf5.patch to fix builds with H5MD (see + gh#espressomd/espresso#3543) + ------------------------------------------------------------------- Mon Jul 12 22:24:29 UTC 2021 - Christoph Junghans diff --git a/python3-espressomd.spec b/python3-espressomd.spec index 4016467..9a530f8 100644 --- a/python3-espressomd.spec +++ b/python3-espressomd.spec @@ -1,7 +1,7 @@ # -# spec file for package python3-espressomd +# spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2014 Christoph Junghans # # All modifications and additions to the file contributed by third parties @@ -46,6 +46,10 @@ Source: https://github.com/%{modname}/%{pkgname}/releases/download/%{ver Patch0: boost-1.74.patch # PATCH-FIX-OPENSUSE missing_size_t.patch gh#espressomd/espresso#4274 Patch1: missing_size_t.patch +# PATCH-FIX-OPENSUSE hdf5.patch gh#espressomd/espresso#3543 +Patch2: hdf5.patch +# PATCH-FIX-OPENSUSE rpath.patch boo#1198352 +Patch3: rpath.patch BuildRequires: cmake BuildRequires: fftw3-devel BuildRequires: gcc-c++ @@ -85,6 +89,8 @@ systems, for example DNA and lipid membranes. %setup -q -n %{pkgname} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh diff --git a/rpath.patch b/rpath.patch new file mode 100644 index 0000000..60a2c64 --- /dev/null +++ b/rpath.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 238e6dac3..96cbaa9a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,7 @@ + + cmake_minimum_required(VERSION 3.4) + message(STATUS "CMake version: ${CMAKE_VERSION}") ++set(CMAKE_SKIP_RPATH ON) + + # C++ standard + enable_language(CXX) +