Hello community, here is the log from the commit of package votca-csgapps for openSUSE:Factory checked in at 2019-11-30 10:37:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-csgapps (Old) and /work/SRC/openSUSE:Factory/.votca-csgapps.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-csgapps" Sat Nov 30 10:37:08 2019 rev:11 rq:750180 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/votca-csgapps/votca-csgapps.changes 2019-02-28 21:38:35.509636630 +0100 +++ /work/SRC/openSUSE:Factory/.votca-csgapps.new.26869/votca-csgapps.changes 2019-11-30 10:38:08.356166727 +0100 @@ -1,0 +2,7 @@ +Thu Nov 21 14:59:55 UTC 2019 - Christoph Junghans <jungh...@votca.org> + +- Upgrade to 1.5.1 + * build fixes for Centos7 + * details: https://github.com/votca/csg/blob/stable/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- votca-csgapps-1.5.tar.gz New: ---- votca-csgapps-1.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-csgapps.spec ++++++ --- /var/tmp/diff_new_pack.2HkAAz/_old 2019-11-30 10:38:08.784166676 +0100 +++ /var/tmp/diff_new_pack.2HkAAz/_new 2019-11-30 10:38:08.784166676 +0100 @@ -17,7 +17,7 @@ # Name: votca-csgapps -Version: 1.5 +Version: 1.5.1 %define uversion %{version} Release: 0 Summary: VOTCA coarse-graining engine applications ++++++ votca-csgapps-1.5.tar.gz -> votca-csgapps-1.5.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.5/.gitlab-ci.yml new/csgapps-1.5.1/.gitlab-ci.yml --- old/csgapps-1.5/.gitlab-ci.yml 2019-01-31 15:48:15.000000000 +0100 +++ new/csgapps-1.5.1/.gitlab-ci.yml 2019-11-21 03:37:01.000000000 +0100 @@ -11,6 +11,11 @@ DISTRO: "latest" image: votca/buildenv:${DISTRO} stage: build + artifacts: + paths: + - ${CI_PROJECT_DIR}/votca + when: always + dependencies: [] cache: paths: - ccache/ @@ -18,12 +23,14 @@ - ccache -z - j="$(grep -c processor /proc/cpuinfo 2>/dev/null)" || j=0; ((j++)) - git branch commit_of_build_${CI_BUILD_ID} ${CI_COMMIT_SHA} - - cd $HOME - - git clone --recursive https://github.com/votca/votca + - git clone https://github.com/votca/votca - pushd votca - - if [[ ( ${CI_COMMIT_REF_NAME} =~ ^for/([^/]*)/.* || ${CI_COMMIT_REF_NAME} =~ ^(stable)$ ) && ${BASH_REMATCH[1]} != master ]]; then - git checkout -b ${BASH_REMATCH[1]} origin/${BASH_REMATCH[1]} && git submodule update --recursive --init; + - if [[ ${CI_COMMIT_TAG} = v[12].[0-9]* ]]; then + git checkout -b ${CI_COMMIT_TAG} ${CI_COMMIT_TAG}; + elif [[ ( ${CI_COMMIT_REF_NAME} =~ ^for/([^/]*)/.* || ${CI_COMMIT_REF_NAME} =~ ^(stable)$ ) && ${BASH_REMATCH[1]} != master ]]; then + git checkout -b ${BASH_REMATCH[1]} origin/${BASH_REMATCH[1]}; fi + - git submodule update --recursive --init - git -C ${CI_PROJECT_NAME} fetch ${CI_PROJECT_DIR} commit_of_build_${CI_BUILD_ID} - git -C ${CI_PROJECT_DIR} branch -d commit_of_build_${CI_BUILD_ID} - git -C ${CI_PROJECT_NAME} checkout -f ${CI_COMMIT_SHA} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.5/CMakeLists.txt new/csgapps-1.5.1/CMakeLists.txt --- old/csgapps-1.5/CMakeLists.txt 2019-01-31 15:48:15.000000000 +0100 +++ new/csgapps-1.5.1/CMakeLists.txt 2019-11-21 03:37:01.000000000 +0100 @@ -2,7 +2,7 @@ project(csgapps) -set(PROJECT_VERSION "1.5") +set(PROJECT_VERSION "1.5.1") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules) @@ -40,7 +40,7 @@ #Find external packages ######################################################################## -find_package(Boost 1.57.0 REQUIRED COMPONENTS program_options ) +find_package(Boost 1.53.0 REQUIRED COMPONENTS program_options ) include_directories(${Boost_INCLUDE_DIRS}) set (BOOST_LIBRARIES ${Boost_PROGRAM_OPTIONS_LIBRARY}) @@ -58,10 +58,9 @@ foreach(DIR ${DIRS}) file(GLOB SRC ${DIR}/*.cc) add_executable(${DIR} ${SRC}) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${DIR}) #needed for out-of-source build target_link_libraries(${DIR} ${VOTCA_CSG_LIBRARIES} ${VOTCA_TOOLS_LIBRARIES} ${BOOST_LIBRARIES}) install(TARGETS ${DIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - set_target_properties(${DIR} PROPERTIES OUTPUT_NAME ${DIR}/csg_${DIR}) + set_target_properties(${DIR} PROPERTIES OUTPUT_NAME csg_${DIR} RUNTIME_OUTPUT_DIRECTORY ${DIR}) if(ENABLE_TESTING) add_test(${DIR}Help ${DIR}/csg_${DIR} --help) # run tests for tools and csg as well for coverage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/csgapps-1.5/part_dist/part_dist.cc new/csgapps-1.5.1/part_dist/part_dist.cc --- old/csgapps-1.5/part_dist/part_dist.cc 2019-01-31 15:48:15.000000000 +0100 +++ new/csgapps-1.5.1/part_dist/part_dist.cc 2019-11-21 03:37:01.000000000 +0100 @@ -134,9 +134,9 @@ cout << "Wrong range format, use min:step:max\n"; return 1; } - min = boost::lexical_cast<double>(toks[0]); - step = boost::lexical_cast<double>(toks[1]); - max = boost::lexical_cast<double>(toks[2]); + min = stod(toks[0]); + step = stod(toks[1]); + max = stod(toks[2]); // Calculate number of bins n_bins = (int)((max-min)/(1.*step)+1);
