Hello community, here is the log from the commit of package votca-xtp for openSUSE:Factory checked in at 2017-10-13 14:20:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-xtp (Old) and /work/SRC/openSUSE:Factory/.votca-xtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-xtp" Fri Oct 13 14:20:34 2017 rev:3 rq:533780 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/votca-xtp/votca-xtp.changes 2017-09-04 12:39:22.517741926 +0200 +++ /work/SRC/openSUSE:Factory/.votca-xtp.new/votca-xtp.changes 2017-10-13 14:21:01.895186026 +0200 @@ -1,0 +2,10 @@ +Thu Oct 12 22:13:47 UTC 2017 - [email protected] + +- Add 55.patch to fix compile with gcc-7 + +------------------------------------------------------------------- +Wed Oct 11 16:11:14 UTC 2017 - [email protected] + +- split boost-devel into libboost-* (bug #1062801) + +------------------------------------------------------------------- New: ---- 55.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-xtp.spec ++++++ --- /var/tmp/diff_new_pack.zgiTPx/_old 2017-10-13 14:21:02.935140302 +0200 +++ /var/tmp/diff_new_pack.zgiTPx/_new 2017-10-13 14:21:02.935140302 +0200 @@ -26,12 +26,22 @@ Url: http://www.votca.org Source0: https://github.com/votca/xtp/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz Source1: https://github.com/votca/xtp/releases/download/v%{uversion}/votca-xtp-manual-%{uversion}.pdf +# PATCH-FIX-UPSTREAM - 55.patch - fix compile with gcc-7 +Patch0: https://github.com/votca/xtp/pull/55.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: pkg-config +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_program_options-devel >= 1.48.0 +BuildRequires: libboost_serialization-devel >= 1.48.0 +BuildRequires: libboost_filesystem-devel >= 1.48.0 +BuildRequires: libboost_system-devel >= 1.48.0 +BuildRequires: libboost_timer-devel >= 1.48.0 +%else BuildRequires: boost-devel >= 1.39.0 +%endif BuildRequires: cmake >= 2.8.4 BuildRequires: fdupes BuildRequires: pkgconfig(libvotca_csg) = %{version} @@ -65,7 +75,6 @@ Requires: libvotca_xtp4 = %{version} Requires: %{name} = %{version} Requires: votca-csg-devel = %{version} -Provides: pkgconfig(libvotca_xtp) = %{version} %description devel Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is @@ -101,6 +110,7 @@ %prep %setup -n xtp-%{uversion} -q +%patch0 -p1 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') @@ -121,7 +131,6 @@ cp %{S:1} %{buildroot}%{pkgdocdir} %fdupes %{buildroot}%{_prefix} -cat %{buildroot}%{_libdir}/pkgconfig/libvotca_xtp.pc %post -n libvotca_xtp4 -p /sbin/ldconfig %postun -n libvotca_xtp4 -p /sbin/ldconfig ++++++ 55.patch ++++++ >From f7c2c4cc7c3a7b6771a3da43f6f39529e4f55043 Mon Sep 17 00:00:00 2001 From: Christoph Junghans <[email protected]> Date: Thu, 12 Oct 2017 16:11:36 -0600 Subject: [PATCH] gaussian: fix compile with gcc-7 --- src/libxtp/qmpackages/gaussian.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxtp/qmpackages/gaussian.cc b/src/libxtp/qmpackages/gaussian.cc index 1d63443d..530d39d3 100644 --- a/src/libxtp/qmpackages/gaussian.cc +++ b/src/libxtp/qmpackages/gaussian.cc @@ -1147,7 +1147,7 @@ namespace votca { boost::iter_split(stringList, archive, boost::first_finder("\\\\")); list<std::string>::iterator coord_block = stringList.begin(); - advance(coord_block, 3); + std::advance(coord_block, 3); std::vector<std::string> atom_block; boost::algorithm::split(atom_block, *coord_block, boost::is_any_of("\\"), boost::algorithm::token_compress_on); @@ -1181,7 +1181,7 @@ namespace votca { } // get the QM energy out - advance(coord_block, 1); + std::advance(coord_block, 1); std::vector<std::string> block; std::vector<std::string> energy; boost::algorithm::split(block, *coord_block, boost::is_any_of("\\"), boost::algorithm::token_compress_on);
