From 8f2c3dceeb0e548e263844f10e54c517d95be904 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Jul 08 2020 20:49:10 +0000 Subject: version bump to v4.1.3 (bug #1855054) --- diff --git a/.gitignore b/.gitignore index 7cec43c..cffc838 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /espresso-4.1.0.tar.gz /espresso-4.1.1.tar.gz /espresso-4.1.2.tar.gz +/espresso-4.1.3.tar.gz diff --git a/3725.patch b/3725.patch deleted file mode 100644 index 9ce21bc..0000000 --- a/3725.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 48f042382bfe19c54139c10e29d492864d054678 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= -Date: Fri, 22 May 2020 17:03:17 +0200 -Subject: [PATCH] Fix Variant bug revealed by boost 1.73 - ---- - src/script_interface/Variant.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/script_interface/Variant.hpp b/src/script_interface/Variant.hpp -index e400af836a..6c1751aca1 100644 ---- a/src/script_interface/Variant.hpp -+++ b/src/script_interface/Variant.hpp -@@ -72,7 +72,7 @@ inline bool is_none(Variant const &v) { return is_type(v); } - - template - std::vector pack_pair(const std::pair &pair) { -- return {{pair.first, pair.second}}; -+ return {pair.first, pair.second}; - } - - template diff --git a/espresso.spec b/espresso.spec index 7ae73f8..e7a5c9c 100644 --- a/espresso.spec +++ b/espresso.spec @@ -3,8 +3,8 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: espresso -Version: 4.1.2 -Release: 5%{?dist} +Version: 4.1.3 +Release: 1%{?dist} Summary: Extensible Simulation Package for Research on Soft matter # segfault on s390x: https://github.com/espressomd/espresso/issues/3753 ExcludeArch: s390x @@ -15,8 +15,6 @@ URL: http://espressomd.org Source0: https://github.com/%{name}md/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz %else Source0: https://github.com/%{name}md/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz -# https://github.com/espressomd/espresso/pull/3725.patch on boost-1.73 -Patch0: https://github.com/espressomd/espresso/pull/3725.patch %endif @@ -109,7 +107,6 @@ This package contains %{name} compiled against MPICH2. %setup -q -n espresso-%{commit} %else %setup -q -n %{name} -%patch0 -p1 %endif %build @@ -162,6 +159,9 @@ done %{python3_sitearch}/mpich/%{name}md/ %changelog +* Wed Jul 08 2020 Christoph Junghans - 4.1.3-1 +- version bump to v4.1.3 (bug #1855054) + * Fri Jul 03 2020 Christoph Junghans - 4.1.2-5 - Rebuild for hdf5 1.10.6 diff --git a/sources b/sources index db43842..81c4015 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (espresso-4.1.2.tar.gz) = c6b369e24246c8ff52c585d5193c40c4f75f936a67ab6ad165423ec452522e256e83dccf131cb138272a1a9bb0024fe0fcc4f830f57c99888f2776758908df29 +SHA512 (espresso-4.1.3.tar.gz) = 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934