From 2eabc9415ab8b26cd8d6b56f3e32616e9e7445d6067a105235fc541d45aac008 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 20 Oct 2020 19:21:22 +0000 Subject: [PATCH 1/2] Accepting request 843025 from home:cjunghans:branches:devel:languages:python:numeric - Update to 4.1.4, see https://github.com/espressomd/espresso/blob/4.1.4/NEWS for details - fix unversioned Obsoletes: statement OBS-URL: https://build.opensuse.org/request/show/843025 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python3-espressomd?expand=0&rev=24 --- espresso-4.1.3.tar.gz | 3 --- espresso-4.1.4.tar.gz | 3 +++ python3-espressomd.changes | 12 ++++++++++++ python3-espressomd.spec | 6 +++--- 4 files changed, 18 insertions(+), 6 deletions(-) delete mode 100644 espresso-4.1.3.tar.gz create mode 100644 espresso-4.1.4.tar.gz diff --git a/espresso-4.1.3.tar.gz b/espresso-4.1.3.tar.gz deleted file mode 100644 index 01a39a7..0000000 --- a/espresso-4.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13dd998f71547c6c979a33d918b7f83e1a0e1c5f2bf2ddeeb0d1e99a3dcd6008 -size 16947336 diff --git a/espresso-4.1.4.tar.gz b/espresso-4.1.4.tar.gz new file mode 100644 index 0000000..63ca9a4 --- /dev/null +++ b/espresso-4.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1b68de63755475c5eb3ae8117d8c6d96c8ac36cc0f46dd44417a8e7ebe9242c +size 16950522 diff --git a/python3-espressomd.changes b/python3-espressomd.changes index 91765e1..4b49a3f 100644 --- a/python3-espressomd.changes +++ b/python3-espressomd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Oct 20 19:03:28 UTC 2020 - Christoph Junghans + +- Update to 4.1.4, see + https://github.com/espressomd/espresso/blob/4.1.4/NEWS for + details + +------------------------------------------------------------------- +Tue Sep 8 20:26:00 UTC 2020 - Christoph Junghans + +- fix unversioned Obsoletes: statement + ------------------------------------------------------------------- Fri Aug 21 16:36:20 UTC 2020 - Christoph Junghans diff --git a/python3-espressomd.spec b/python3-espressomd.spec index dceee51..13331b9 100644 --- a/python3-espressomd.spec +++ b/python3-espressomd.spec @@ -35,7 +35,7 @@ %define pkgname espresso %define modname %{pkgname}md Name: python3-%{modname} -Version: 4.1.3 +Version: 4.1.4 Release: 0 Summary: Parallel simulation software for soft matter research License: GPL-3.0-or-later @@ -63,7 +63,7 @@ BuildRequires: python3-h5py %else BuildRequires: boost-devel %endif -Obsoletes: libEspresso4 +Obsoletes: libEspresso4 < 4.1 Requires: python3-numpy Requires: python3-h5py # make sure rpm pulls in the right dependency @@ -103,7 +103,7 @@ export HDF5_USE_SHLIB=yes rm -f %{buildroot}%{_libdir}/lib*.so %check -# https://github.com/espressomd/espresso/issues/3315 +# gh#espressomd/espresso#3315 %ifarch i586 %define testargs ARGS='-E collision_detection' %endif From c81f826cbe6c132c2d91eb69e63cc344a985c9518a6dcaad62f6931907b62867 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Thu, 29 Oct 2020 16:23:33 +0000 Subject: [PATCH 2/2] Accepting request 844904 from home:cjunghans:branches:devel:languages:python:numeric - added boost-1.74.patch to fix build with boost-1.74 (gh#espressomd/espresso#3864) OBS-URL: https://build.opensuse.org/request/show/844904 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python3-espressomd?expand=0&rev=25 --- boost-1.74.patch | 32 ++++++++++++++++++++++++++++++++ python3-espressomd.changes | 6 ++++++ python3-espressomd.spec | 3 +++ 3 files changed, 41 insertions(+) create mode 100644 boost-1.74.patch diff --git a/boost-1.74.patch b/boost-1.74.patch new file mode 100644 index 0000000..8acbd60 --- /dev/null +++ b/boost-1.74.patch @@ -0,0 +1,32 @@ +From a392907978506408482d0bdd388534455ba8dfba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= +Date: Wed, 28 Oct 2020 21:22:39 +0100 +Subject: [PATCH] core: Add guard for boost 1.74.0 + +This include guards against an issue +in boost::serialization from boost 1.74.0 that leads to compiler error +"explicit specialization of undeclared template struct 'version'" when +including . More details in tickets: +https://github.com/boostorg/serialization/issues/210 +https://github.com/boostorg/serialization/issues/217 + +diff --git a/src/core/grid_based_algorithms/lb_particle_coupling.hpp b/src/core/grid_based_algorithms/lb_particle_coupling.hpp +index de12cb4..13111ab 100644 +--- a/src/core/grid_based_algorithms/lb_particle_coupling.hpp ++++ b/src/core/grid_based_algorithms/lb_particle_coupling.hpp +@@ -21,6 +21,15 @@ + + #include "ParticleRange.hpp" + ++/* This include guards against an issue ++ * in boost::serialization from boost 1.74.0 that leads to compiler error ++ * "explicit specialization of undeclared template struct 'version'" when ++ * including . More details in tickets: ++ * https://github.com/boostorg/serialization/issues/210 ++ * https://github.com/boostorg/serialization/issues/217 ++ */ ++#include ++ + #include + + #include "ParticleRange.hpp" diff --git a/python3-espressomd.changes b/python3-espressomd.changes index 4b49a3f..b8eaa41 100644 --- a/python3-espressomd.changes +++ b/python3-espressomd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 29 15:42:42 UTC 2020 - Christoph Junghans + +- added boost-1.74.patch to fix build with boost-1.74 + (gh#espressomd/espresso#3864) + ------------------------------------------------------------------- Tue Oct 20 19:03:28 UTC 2020 - Christoph Junghans diff --git a/python3-espressomd.spec b/python3-espressomd.spec index 13331b9..5c328ed 100644 --- a/python3-espressomd.spec +++ b/python3-espressomd.spec @@ -42,6 +42,8 @@ License: GPL-3.0-or-later Group: Productivity/Scientific/Chemistry URL: http://espressomd.org Source: https://github.com/%{modname}/%{pkgname}/releases/download/%{version}/%{pkgname}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM boost-1.74.patch gh#espressomd/espresso#3864 +Patch0: boost-1.74.patch BuildRequires: cmake BuildRequires: fftw3-devel BuildRequires: gcc-c++ @@ -79,6 +81,7 @@ systems, for example DNA and lipid membranes. %prep %setup -q -n %{pkgname} +%patch0 -p1 %build source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh