Hello community, here is the log from the commit of package votca-tools for openSUSE:Factory checked in at 2017-09-04 12:39:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/votca-tools (Old) and /work/SRC/openSUSE:Factory/.votca-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-tools" Mon Sep 4 12:39:10 2017 rev:9 rq:520512 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/votca-tools/votca-tools.changes 2017-02-03 20:04:47.589016113 +0100 +++ /work/SRC/openSUSE:Factory/.votca-tools.new/votca-tools.changes 2017-09-04 12:39:13.634991647 +0200 @@ -1,0 +2,7 @@ +Sun Sep 3 13:23:09 UTC 2017 - [email protected] + +- Upgrade to 1.4.1 + * fix pkg-config files + * details: https://github.com/votca/csg/blob/master/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- votca-tools-1.4.tar.gz New: ---- votca-tools-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-tools.spec ++++++ --- /var/tmp/diff_new_pack.1aVqCO/_old 2017-09-04 12:39:14.546863355 +0200 +++ /var/tmp/diff_new_pack.1aVqCO/_new 2017-09-04 12:39:14.550862793 +0200 @@ -2,7 +2,7 @@ # spec file for package votca-tools # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2013-2016 Christoph Junghans +# Copyright (c) 2013-2017 Christoph Junghans # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ # Name: votca-tools -Version: 1.4 -%define uversion 1.4 +Version: 1.4.1 +%define uversion 1.4.1 Release: 0 Summary: VOTCA tools library Group: Productivity/Scientific/Chemistry ++++++ votca-tools-1.4.tar.gz -> votca-tools-1.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.4/.travis.yml new/tools-1.4.1/.travis.yml --- old/tools-1.4/.travis.yml 2016-10-29 18:47:46.000000000 +0200 +++ new/tools-1.4.1/.travis.yml 2017-09-02 20:49:40.000000000 +0200 @@ -31,13 +31,12 @@ - texlive-latex-extra - doxygen - graphviz - - python-numpy - gnuplot-nox - octave env: global: - - HDF5_VERSION=1.8.14 + - HDF5_VERSION=1.8.18 - GMX_MAX_THREADS=8 - CCACHE_CPP2=yes #for clang - GVER=4.8 @@ -57,14 +56,15 @@ - wget https://raw.githubusercontent.com/votca/buildutil/master/build.sh && chmod 755 build.sh - 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 && + wget -qO- https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${HDF5_VERSION%.*}/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 [[ ${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 + - pip install --user numpy script: - - PATH="$HOME/hdf5:$PATH" ./build.sh -Wu $([[ ${TRAVIS_BRANCH} = stable ]] || echo "--dev") --prefix "$HOME/votca" + - PATH="$HOME/hdf5:$PATH" ./build.sh -Wu --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}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.4/CMakeLists.txt new/tools-1.4.1/CMakeLists.txt --- old/tools-1.4/CMakeLists.txt 2016-10-29 18:47:46.000000000 +0200 +++ new/tools-1.4.1/CMakeLists.txt 2017-09-02 20:49:40.000000000 +0200 @@ -2,7 +2,7 @@ project(votca-tools) -set(PROJECT_VERSION "1.4") +set(PROJECT_VERSION "1.4.1") string(REGEX REPLACE "^[1-9]+\\.([1-9]+).*$" "\\1" SOVERSION "${PROJECT_VERSION}") if (NOT ${SOVERSION} MATCHES "[1-9]+") message(FATAL_ERROR "Could not determind SOVERSION from ${PROJECT_VERSION}") @@ -87,7 +87,7 @@ if(MKL_FOUND) set(MKL_URL "http://software.intel.com/sites/default/files/managed/76/8c/intel-mkl-and-boost-example.zip";) - set(MKL_MD5 B957EE63A2167AD21B650B47726CD55C ) + set(MKL_MD5 b957ee63a2167ad21b650b47726cd55c ) set(MKL_FILE "intel-mkl-and-boost-example.zip") include(ExternalProject) @@ -98,9 +98,10 @@ BUILD_COMMAND "" INSTALL_COMMAND "" ) - set(MKL_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/intel/src/intel/MKL_and_boost_example/headers") - include_directories(${MKL_INCLUDE_DIR}) - set(MKL_HEADERS "${MKL_INCLUDE_DIR}/mkl_boost_ublas_matrix_prod.hpp" "${MKL_INCLUDE_DIR}/mkl_boost_ublas_gemm.hpp" ) + set(MKL_BOOST_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/intel/src/intel/MKL_and_boost_example/headers") + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/intel/src/intel") + include_directories(${MKL_BOOST_INCLUDE_DIR}) + set(MKL_HEADERS "${MKL_BOOST_INCLUDE_DIR}/mkl_boost_ublas_matrix_prod.hpp" "${MKL_BOOST_INCLUDE_DIR}/mkl_boost_ublas_gemm.hpp" ) install(FILES ${MKL_HEADERS} DESTINATION include/votca/tools) endif(MKL_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.4/share/doc/Doxyfile.in new/tools-1.4.1/share/doc/Doxyfile.in --- old/tools-1.4/share/doc/Doxyfile.in 2016-10-29 18:47:46.000000000 +0200 +++ new/tools-1.4.1/share/doc/Doxyfile.in 2017-09-02 20:49:40.000000000 +0200 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = @VERSION@ +PROJECT_NUMBER = @PROJECT_VERSION@ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.4/src/libtools/CMakeLists.txt new/tools-1.4.1/src/libtools/CMakeLists.txt --- old/tools-1.4/src/libtools/CMakeLists.txt 2016-10-29 18:47:46.000000000 +0200 +++ new/tools-1.4.1/src/libtools/CMakeLists.txt 2017-09-02 20:49:40.000000000 +0200 @@ -49,6 +49,9 @@ add_library(votca_tools ${VOTCA_SOURCES} ${VOTCA_SQL_SOURCES} ${VOTCA_LINALG_SOURCES}) add_dependencies(votca_tools gitversion) +if(MKL_FOUND) + add_dependencies(votca_tools intel) +endif(MKL_FOUND) set_target_properties(votca_tools PROPERTIES SOVERSION ${SOVERSION}) target_link_libraries(votca_tools ${Boost_LIBRARIES} ${LINALG_LIBRARIES} ${SQLITE3_LIBRARIES} ${FFTW3_LIBRARIES} ${EXPAT_LIBRARIES} ${THREAD_LIBRARIES} ${MATH_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tools-1.4/src/libtools/libvotca_tools.pc.in new/tools-1.4.1/src/libtools/libvotca_tools.pc.in --- old/tools-1.4/src/libtools/libvotca_tools.pc.in 2016-10-29 18:47:46.000000000 +0200 +++ new/tools-1.4.1/src/libtools/libvotca_tools.pc.in 2017-09-02 20:49:40.000000000 +0200 @@ -5,7 +5,7 @@ Name: libvotca_tools Description: basic tools of the votca package URL: http://www.votca.org -Version: @VERSION@ +Version: @PROJECT_VERSION@ Requires: @SQLITE3_PKG@ @GSL_PKG@ @EIGEN_PKG@ @FFTW3_PKG@ Libs: -L${libdir} -lvotca_tools @EXPAT_LIBS_PKG@ @BOOST_LIBS_PKG@ @THREAD_LIBRARIES@ Libs.private: -lm
