Hello community,
here is the log from the commit of package votca-csgapps for openSUSE:Factory checked in at 2017-02-03 16:29:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/votca-csgapps (Old)
and /work/SRC/openSUSE:Factory/.votca-csgapps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-csgapps"
Changes:
--------
--- /work/SRC/openSUSE:Factory/votca-csgapps/votca-csgapps.changes 2016-08-25 09:56:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.votca-csgapps.new/votca-csgapps.changes 2017-02-03 20:04:46.757133205 +0100
@@ -1,0 +2,22 @@
+Thu Feb 2 15:34:31 UTC 2017 - adam.majer@suse.de
+
+- use individual libboost-*-devel packages instead of boost-devel
+
+-------------------------------------------------------------------
+Sat Nov 5 15:31:49 UTC 2016 - jengelh@inai.de
+
+- Update descriptions
+
+-------------------------------------------------------------------
+Sat Oct 29 21:33:07 UTC 2016 - junghans@votca.org
+
+- Upgrade to 1.4
+ * details: https://github.com/votca/csg/blob/master/CHANGELOG.md
+
+-------------------------------------------------------------------
+Tue Sep 27 18:19:09 UTC 2016 - junghans@votca.org
+
+- Upgrade to 1.4_rc1
+ * details: https://github.com/votca/csg/blob/master/CHANGELOG.md
+
+-------------------------------------------------------------------
Old:
----
votca-csgapps-1.3.1.tar.gz
New:
----
votca-csgapps-1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ votca-csgapps.spec ++++++
--- /var/tmp/diff_new_pack.4NXK4W/_old 2017-02-03 20:04:47.373046511 +0100
+++ /var/tmp/diff_new_pack.4NXK4W/_new 2017-02-03 20:04:47.373046511 +0100
@@ -1,64 +1,61 @@
#
-# votca-csgapps.spec
+# spec file for package votca-csgapps
#
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2013-2016 Christoph Junghans
#
-# Originally written by Jussi Lehtola
-# Fixed for multi-distro build by Klaus Kaempf
-#
-# Licensed under the Apache Software License (ASL 2.0)
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: votca-csgapps
-Version: 1.3.1
+Version: 1.4
+%define uversion 1.4
Release: 0
Summary: VOTCA coarse-graining engine applications
Group: Productivity/Scientific/Chemistry
License: Apache-2.0
URL: http://www.votca.org
-Source0: https://github.com/votca/csgapps/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0: https://github.com/votca/csgapps/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gromacs-devel
BuildRequires: gcc-c++
BuildRequires: pkg-config
BuildRequires: fdupes
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_program_options-devel
+%else
BuildRequires: boost-devel >= 1.39.0
+%endif
BuildRequires: pkgconfig(libvotca_csg) = %{version}
BuildRequires: pkgconfig(libvotca_tools) = %{version}
BuildRequires: cmake
%description
Versatile Object-oriented Toolkit for Coarse-graining Applications (VOTCA) is
-a package intended to reduce the amount of routine work when doing systematic
+a package to reduce the amount of routine work when doing systematic
coarse-graining of various systems. The core is written in C++.
-This package contains sample applications of the Coarse Graining Engine of VOTCA package.
+This package contains sample applications of the VOTCA Coarse Graining Engine.
%prep
-%setup -n csgapps-%{version} -q
+%setup -n csgapps-%{uversion} -q
%build
-%if %{defined fedora}
-mkdir build
-cd build
-%endif
-%if %{undefined cmake}
-%define cmake cmake
-mkdir build
-cd build
-%endif
-%{cmake} \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DCMAKE_VERBOSE_MAKEFILE=TRUE \
- -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
- -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=1 ..
+%{cmake}
make %{?_smp_mflags}
%install
-cd build
-make install DESTDIR=%{buildroot}
+make -C build install DESTDIR=%{buildroot}
%fdupes %{buildroot}%{_prefix}
++++++ votca-csgapps-1.3.1.tar.gz -> votca-csgapps-1.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.3.1/.travis.yml new/csgapps-1.4/.travis.yml
--- old/csgapps-1.3.1/.travis.yml 2016-08-19 22:03:14.000000000 +0200
+++ new/csgapps-1.4/.travis.yml 2016-10-29 18:47:51.000000000 +0200
@@ -8,58 +8,79 @@
addons:
apt:
- sources: boost-latest
+ sources:
+ - boost-latest
+ - george-edison55-precise-backports
+ - ubuntu-toolchain-r-test
packages:
- - cmake
- ccache
+ - gcc-4.8
+ - g++-4.8
- libfftw3-dev
+ - cmake
+ - cmake-data
- libgsl0-dev
- txt2tags
- libboost1.55-all-dev
- libexpat1-dev
- libsqlite3-dev
+ - libhdf5-serial-dev
- pkg-config
- pgf
- texlive-fonts-recommended
- texlive-latex-extra
+ - texlive-latex-recommended
+ - cm-super
- doxygen
- graphviz
- python-numpy
- gnuplot-nox
- octave
- - gromacs-dev
env:
global:
+ - HDF5_VERSION=1.8.14
- GMX_MAX_THREADS=8
- - CCACHE_CPP2=yes
+ - CCACHE_CPP2=yes #for clang
+ - GVER=4.8
matrix: #NINJA=1 is currently not support by Travis' cmake, enable when >=2.8.9
- - WERROR=yes J=4 #J>4 triggers an internal compiler in travis' g++
- - J=1
- - BDIR=build J=4
- - BDIR=build J=1
- - MAN=yes J=4
+ - BDIR=build WERROR=yes J=4 TYPE=Debug
+ - BDIR=build WALL=yes J=4 TYPE=Debug
+ - BDIR=build WERROR=yes J=4 TYPE=Release
+ - BDIR=build WALL=yes J=4 TYPE=Release MAN=yes
- MINIMAL=yes J=4
before_script:
+ - rm -vrf * .git
- wget https://raw.githubusercontent.com/votca/buildutil/master/build.sh && chmod 755 build.sh
- - mkdir -p "$HOME/votca/src" "$HOME/votca/share/votca/scripts/inverse" "$HOME/bin"
- - wget -O "$HOME/votca/share/votca/scripts/inverse/cma.py" http://www.lri.fr/~hansen/cma.py
- - ln -s /usr/bin/ccache "$HOME/bin/clang++"
- - ln -s /usr/bin/ccache "$HOME/bin/clang"
+ - mkdir -p "$HOME/votca/src"
+ - if [[ ${MINIMAL} != yes ]]; then
+ wget -qO- https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${HDF5_VERSION}/src/hdf5-${HDF5_VERSION}.tar.gz | tar -xz &&
+ cd hdf5-${HDF5_VERSION} && ./configure --prefix=$HOME/hdf5 && make -j4 &> /dev/null && make install && cd ..;
+ fi
+ - if [[ ${GMX_VERSION} = 9999 ]]; then
+ CMAKE_VERSION=3.4.3-Linux-x86_64 &&
+ wget --no-check-certificate -qO- http://www.cmake.org/files/v${CMAKE_VERSION:0:3}/cmake-${CMAKE_VERSION}.tar.gz | tar -xz &&
+ export CMAKE="$PWD/cmake-${CMAKE_VERSION}/bin/cmake" ;
+ fi
+ - if [[ ${MAN} ]]; then git clone --depth=1 https://github.com/votca/doxygen.git "$HOME/votca/src/devdoc"; fi
+ - if [[ ${GVER} ]]; then export CC=gcc-${GVER}; export CXX=g++-${GVER}; fi
script:
- - PATH="$HOME/bin:/usr/lib/ccache:$PATH" ./build.sh -Wu --prefix "$HOME/votca" ${MAN:+--devdoc}
- ${TEST:+--runtest=$TEST} ${WERROR:+--warn-to-errors} ${MINIMAL:+--minimal}
- ${J:+-j$J} ${BDIR:+--builddir=$BDIR} ${NINJA:+--ninja} ${WALL:+--Wall}
- --directory "$HOME/votca/src" --no-clean --depth 1 --gmx-release 4.6.7
- tools ${GROMACS:+gromacs} csg csgapps ${MAN:+csg-manual} ${TEST:+csg-tutorials}
- ${CTP:+kmc moo ctp} ${GROMACS:+-DGMX_USE_RDTSCP=OFF} ${GROMACS:+-DGROMACS_PKG_OVERWRITE=libgmx}
+ - PATH="$HOME/hdf5:$PATH" ./build.sh -Wu $([[ ${TRAVIS_BRANCH} = stable ]] || echo "--dev") --prefix "$HOME/votca"
+ ${TYPE:+-DCMAKE_BUILD_TYPE=${TYPE}}
+ ${TEST:+--runtest=$TEST} ${WERROR:+--warn-to-errors} -DWITH_H5MD=ON ${MINIMAL:+--minimal} ${MAN:+--devdoc}
+ ${J:+-j$J} ${BDIR:+--builddir=$BDIR} ${NINJA:+--ninja} ${WALL:+--Wall} ${GMX_VERSION:+--gmx-release ${GMX_VERSION}}
+ --directory "$HOME/votca/src" --no-clean --depth 1 -DGMX_USE_RDTSCP=OFF ${GMX_DOUBLE:+-DGMX_DOUBLE=yes}
+ tools $([[ ${MINIMAL} ]] || echo gromacs) csg csgapps ${MAN:+csg-manual} ${TEST:+csg-tutorials}
+ ${CTP:+kmc moo ctp} ${XTP:+xtp}
cache:
- directories:
- - $HOME/.ccache
+ - ccache
compiler:
- - clang
- gcc
+
+notifications:
+ email:
+ - votca-commits@googlegroups.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.3.1/CMakeLists.txt new/csgapps-1.4/CMakeLists.txt
--- old/csgapps-1.3.1/CMakeLists.txt 2016-08-19 22:03:14.000000000 +0200
+++ new/csgapps-1.4/CMakeLists.txt 2016-10-29 18:47:51.000000000 +0200
@@ -2,7 +2,7 @@
project(csgapps)
-set(PROJECT_VERSION "1.3.1")
+set(PROJECT_VERSION "1.4")
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
@@ -12,7 +12,24 @@
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS)
enable_language(CXX)
+
+######################################################################
+# compiler tests
+# these need ot be done early (before further tests).
+#####################################################################
+
+#needed by csg
include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
+if(COMPILER_SUPPORTS_CXX11)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+else()
+ message(FATAL_ERROR "Could not find a C++-11 compiler")
+endif()
+
+########################################################################
+#Find external packages
+########################################################################
find_package(Boost 1.39.0 REQUIRED COMPONENTS program_options )
include_directories(${Boost_INCLUDE_DIRS})
@@ -44,3 +61,6 @@
add_custom_target(uninstall)
endif()
add_dependencies(uninstall uninstall-csgapps)
+
+include(FeatureSummary)
+feature_summary(INCLUDE_QUIET_PACKAGES WHAT ALL)