Hello community, here is the log from the commit of package votca-csgapps for openSUSE:Factory checked in at 2014-09-06 12:19:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-22 18:17:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.votca-csgapps.new/votca-csgapps.changes 2014-09-06 17:05:29.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 5 22:03:24 UTC 2014 - jungh...@votca.org + +- update to 1.2.4 + - minor cmake fixes + +------------------------------------------------------------------- Old: ---- votca-csgapps-1.2.3.tar.gz New: ---- votca-csgapps-1.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ votca-csgapps.spec ++++++ --- /var/tmp/diff_new_pack.E8piGO/_old 2014-09-06 17:05:30.000000000 +0200 +++ /var/tmp/diff_new_pack.E8piGO/_new 2014-09-06 17:05:30.000000000 +0200 @@ -1,7 +1,7 @@ # # votca-csgapps.spec # -# Copyright (c) 2013 Christoph Junghans +# Copyright (c) 2013-2014 Christoph Junghans # # Originally written by Jussi Lehtola <jussileht...@fedoraproject.org> # Fixed for multi-distro build by Klaus Kaempf <kkae...@suse.de> @@ -10,13 +10,13 @@ # Name: votca-csgapps -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: VOTCA coarse-graining engine applications Group: Productivity/Scientific/Chemistry License: Apache-2.0 URL: http://www.votca.org -Source0: http://votca.googlecode.com/files/%{name}-%{version}.tar.gz +Source0: http://downloads.votca.googlecode.com/hg/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gromacs-devel @@ -48,7 +48,8 @@ mkdir build cd build %endif -%{cmake} -DCMAKE_INSTALL_PREFIX=/usr \ +%{cmake} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ ++++++ votca-csgapps-1.2.3.tar.gz -> votca-csgapps-1.2.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csgapps-1.2.3/CMakeLists.txt new/votca-csgapps-1.2.4/CMakeLists.txt --- old/votca-csgapps-1.2.3/CMakeLists.txt 2012-08-15 06:29:24.000000000 +0200 +++ new/votca-csgapps-1.2.4/CMakeLists.txt 2014-08-31 23:55:32.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -set(PROJECT_VERSION "1.2.3") +set(PROJECT_VERSION "1.2.4") project(csgapps) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csgapps-1.2.3/CMakeModules/FindVOTCA_CSG.cmake new/votca-csgapps-1.2.4/CMakeModules/FindVOTCA_CSG.cmake --- old/votca-csgapps-1.2.3/CMakeModules/FindVOTCA_CSG.cmake 2012-08-15 06:29:24.000000000 +0200 +++ new/votca-csgapps-1.2.4/CMakeModules/FindVOTCA_CSG.cmake 2014-08-31 23:55:32.000000000 +0200 @@ -52,7 +52,7 @@ include(CheckLibraryExists) check_library_exists("${VOTCA_CSG_LIBRARY};${VOTCA_CSG_DEP_LIBRARIES}" VotcaCsgFromC "" FOUND_VOTCA_CSG_VERSION) if(NOT FOUND_VOTCA_CSG_VERSION) - message(FATAL_ERROR "Could not find VotcaCsgFromC in ${VOTCA_CSG_LIBRARY};${VOTCA_CSG_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set VOTCA_CSG_LIBRARY and VOTCA_CSG_DEP_LIBRARIES by hand, which set votca_csg lib it's depencies (i.e. -DVOTCA_CSG_LIBRARY='/path/to/libvotca_csg.so" -VOTCA_CSG_DEP_LIBRARIES="/path/to/libgsl.so;/path/to/libm.so') !") + message(FATAL_ERROR "Could not find VotcaCsgFromC in ${VOTCA_CSG_LIBRARY};${VOTCA_CSG_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set VOTCA_CSG_LIBRARY and VOTCA_CSG_DEP_LIBRARIES by hand, which set votca_csg lib it's depencies (i.e. -DVOTCA_CSG_LIBRARY='/path/to/libvotca_csg.so' -VOTCA_CSG_DEP_LIBRARIES='/path/to/libgsl.so;/path/to/libm.so') !") endif(NOT FOUND_VOTCA_CSG_VERSION) endif (VOTCA_CSG_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-csgapps-1.2.3/CMakeModules/FindVOTCA_TOOLS.cmake new/votca-csgapps-1.2.4/CMakeModules/FindVOTCA_TOOLS.cmake --- old/votca-csgapps-1.2.3/CMakeModules/FindVOTCA_TOOLS.cmake 2012-08-15 06:29:24.000000000 +0200 +++ new/votca-csgapps-1.2.4/CMakeModules/FindVOTCA_TOOLS.cmake 2014-08-31 23:55:32.000000000 +0200 @@ -27,14 +27,6 @@ find_path(VOTCA_TOOLS_INCLUDE_DIR votca/tools/version.h HINTS ${PC_VOTCA_TOOLS_INCLUDE_DIRS}) find_path(VOTCA_TOOLS_HAS_SQLITE3 votca/tools/database.h HINTS ${PC_VOTCA_TOOLS_INCLUDE_DIRS}) -if (VOTCA_TOOLS_HAS_SQLITE3) - #due to include <sqlite3.h> in database.h - find_package(SQLITE3 REQUIRED) - set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR};${SQLITE3_INCLUDE_DIR}" ) -else(VOTCA_TOOLS_HAS_SQLITE3) - set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR}" ) -endif (VOTCA_TOOLS_HAS_SQLITE3) - find_library(VOTCA_TOOLS_LIBRARY NAMES votca_tools HINTS ${PC_VOTCA_TOOLS_LIBRARY_DIRS} ) @@ -51,6 +43,7 @@ endif("${VOTCA_TOOLS_LIBRARY}" MATCHES "libvotca_tools[^;]*\\.a") set(VOTCA_TOOLS_LIBRARIES "${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}" ) +set(VOTCA_TOOLS_INCLUDE_DIRS "${VOTCA_TOOLS_INCLUDE_DIR}" ) include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set VOTCA_TOOLS_FOUND to TRUE @@ -61,7 +54,7 @@ include(CheckLibraryExists) check_library_exists("${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}" VotcaToolsFromC "" FOUND_VOTCA_TOOLS_VERSION) if(NOT FOUND_VOTCA_TOOLS_VERSION) - message(FATAL_ERROR "Could not find VotcaToolsFromC in ${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set VOTCA_TOOLS_LIBRARY and VOTCA_TOOLS_DEP_LIBRARIES by hand, which set votca_tools lib it's depencies (i.e. -DVOTCA_TOOLS_LIBRARY='/path/to/libvotca_tools.so" -VOTCA_TOOLS_DEP_LIBRARIES="/path/to/libgsl.so;/path/to/libm.so') !") + message(FATAL_ERROR "Could not find VotcaToolsFromC in ${VOTCA_TOOLS_LIBRARY};${VOTCA_TOOLS_DEP_LIBRARIES}, take look at the error message in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log to find out what was going wrong. If you don't have pkg-config installed you will most likely have to set VOTCA_TOOLS_LIBRARY and VOTCA_TOOLS_DEP_LIBRARIES by hand, which set votca_tools lib it's depencies (i.e. -DVOTCA_TOOLS_LIBRARY='/path/to/libvotca_tools.so' -DVOTCA_TOOLS_DEP_LIBRARIES='/path/to/libgsl.so;/path/to/libm.so') !") endif(NOT FOUND_VOTCA_TOOLS_VERSION) endif (VOTCA_TOOLS_FOUND) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
