Hello community, here is the log from the commit of package python-espressopp for openSUSE:Factory checked in at 2018-07-18 22:56:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-espressopp (Old) and /work/SRC/openSUSE:Factory/.python-espressopp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-espressopp" Wed Jul 18 22:56:25 2018 rev:4 rq:623508 version:2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-espressopp/python-espressopp.changes 2017-10-26 18:44:38.571226713 +0200 +++ /work/SRC/openSUSE:Factory/.python-espressopp.new/python-espressopp.changes 2018-07-18 22:56:44.334403958 +0200 @@ -1,0 +2,7 @@ +Sun Jul 15 21:17:15 UTC 2018 - [email protected] + +- version bump to v2.0 (boo#1089815) + * many fixes: https://github.com/espressopp/espressopp/compare/v1.9.5...v2.0 + * added 229.patch from pull request 229 to fix build with boost-1.67 + +------------------------------------------------------------------- Old: ---- espressopp-1.9.5.tar.gz New: ---- 229.patch espressopp-2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-espressopp.spec ++++++ --- /var/tmp/diff_new_pack.Wl2EWA/_old 2018-07-18 22:56:45.130401318 +0200 +++ /var/tmp/diff_new_pack.Wl2EWA/_new 2018-07-18 22:56:45.130401318 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-espressopp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017-2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,27 @@ %define modname espressopp Name: python-%{modname} -Version: 1.9.5 +# Build with OpenMPI +%if 0%{?suse_version} >= 1330 + # OpenMPI >= 2 is not available on ppc64be + %ifarch ppc64 + %define mpiver openmpi + %else + %define mpiver openmpi2 + %endif +%else + # Keep OpenMPI1 for older releases where OpenMPI2 is not available + %define mpiver openmpi +%endif +Version: 2.0 Release: 0 Summary: Parallel simulation software for soft matter research License: GPL-3.0+ Group: Productivity/Scientific/Chemistry Url: http://www.espresso-pp.de/ Source0: https://github.com/%{modname}/%{modname}/archive/v%{version}.tar.gz#/%{modname}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM 229.patch: fix build with boost-1.67 +Patch0: https://github.com/espressopp/espressopp/pull/229.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,11 +53,16 @@ %endif BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: openmpi-devel +BuildRequires: %{mpiver} +BuildRequires: %{mpiver}-devel +Requires: %{mpiver} BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: python-mpi4py-devel +Requires: python-mpi4py BuildRequires: pkgconfig(fftw3) +Requires: python-h5py +BuildRequires: python-h5py %description ESPResSo++ is an extensible, flexible, parallel simulation software @@ -55,6 +74,7 @@ %prep %setup -q -n %{modname}-%{version} +%patch0 -p1 # Remove bundled libs rm -rf contrib/boost contrib/mpi4py @@ -65,7 +85,7 @@ sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/Version.cpp %build -source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh +source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh %{cmake} -DWITH_RC_FILES=OFF -DEXTERNAL_BOOST=ON -DEXTERNAL_MPI4PY=ON #no parallel build to save memory @@ -74,6 +94,10 @@ %install make -C build install DESTDIR=%{buildroot} +#check +# not enough memory +#LD_LIBRARY_PATH='%{buildroot}/%{_libdir}::%{_libdir}/mpi/gcc/%{mpiver}/%{_lib}' make -C build test CTEST_OUTPUT_ON_FAILURE=1 + %files %defattr(-,root,root,-) %doc AUTHORS NEWS README.md COPYING ++++++ 229.patch ++++++ >From dadca19cb1dad95d1163163404b281118da150cf Mon Sep 17 00:00:00 2001 From: Christoph Junghans <[email protected]> Date: Sun, 15 Jul 2018 19:41:19 -0600 Subject: [PATCH] fix build with boost-1.67 --- src/FixedPairList.cpp | 1 + src/integrator/Adress.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/FixedPairList.cpp b/src/FixedPairList.cpp index d4de07a9..0d4278be 100644 --- a/src/FixedPairList.cpp +++ b/src/FixedPairList.cpp @@ -29,6 +29,7 @@ //#include <algorithm> #include <boost/bind.hpp> #include "storage/Storage.hpp" +#include "boost/serialization/vector.hpp" #include "Buffer.hpp" #include "esutil/Error.hpp" diff --git a/src/integrator/Adress.cpp b/src/integrator/Adress.cpp index 5d3b5c75..134ac3dd 100644 --- a/src/integrator/Adress.cpp +++ b/src/integrator/Adress.cpp @@ -28,6 +28,7 @@ #include "Cell.hpp" #include "System.hpp" #include "storage/Storage.hpp" +#include "boost/serialization/vector.hpp" #include "bc/BC.hpp" #include "FixedTupleListAdress.hpp" #include "iterator/CellListAllPairsIterator.hpp" ++++++ espressopp-1.9.5.tar.gz -> espressopp-2.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-espressopp/espressopp-1.9.5.tar.gz /work/SRC/openSUSE:Factory/.python-espressopp.new/espressopp-2.0.tar.gz differ: char 13, line 1
