Hello community,
here is the log from the commit of package votca-tools for openSUSE:Factory checked in at 2014-09-06 12:19:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/votca-tools (Old)
and /work/SRC/openSUSE:Factory/.votca-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "votca-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/votca-tools/votca-tools.changes 2014-01-02 11:15:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.votca-tools.new/votca-tools.changes 2014-09-06 17:05:31.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Sep 5 21:49:16 UTC 2014 - junghans@votca.org
+
+- Upgrade to 1.2.4
+ * support for Boost 1.53
+ * drop votca-tools-1.2.3-boost-1.53.patch: merged upstream
+
+-------------------------------------------------------------------
Old:
----
votca-tools-1.2.3-boost-1.53.patch
votca-tools-1.2.3_pristine.tar.gz
New:
----
votca-tools-1.2.4_pristine.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ votca-tools.spec ++++++
--- /var/tmp/diff_new_pack.Jwyi0z/_old 2014-09-06 17:05:31.000000000 +0200
+++ /var/tmp/diff_new_pack.Jwyi0z/_new 2014-09-06 17:05:31.000000000 +0200
@@ -1,7 +1,7 @@
#
# votca_tools.spec
#
-# Copyright (c) 2013 Christoph Junghans
+# Copyright (c) 2013-2014 Christoph Junghans
#
# Originally written by Jussi Lehtola
# Fixed for multi-distro build by Klaus Kaempf
@@ -10,24 +10,27 @@
#
Name: votca-tools
-Version: 1.2.3
+Version: 1.2.4
Release: 0
Summary: VOTCA tools library
Group: Productivity/Scientific/Chemistry
License: Apache-2.0
URL: http://www.votca.org
-Source0: http://votca.googlecode.com/files/%{name}-%{version}_pristine.tar.gz
-# PATCH-FIX-UPSTREAM votca-tools-1.2.3-boost-1.53.patch #https://code.google.com/p/votca/issues/detail?id=131
-Patch0: votca-tools-1.2.3-boost-1.53.patch
+Source0: http://downloads.votca.googlecode.com/hg/%{name}-%{version}_pristine.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
+%if %{defined fedora}
+BuildRequires: pkgconfig
+BuildRequires: expat-devel
+%else
BuildRequires: pkg-config
+BuildRequires: libexpat-devel
+%endif
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(gsl)
-BuildRequires: libexpat-devel
BuildRequires: boost-devel >= 1.39.0
BuildRequires: cmake
BuildRequires: txt2tags
@@ -62,13 +65,22 @@
%prep
%setup -q
-%patch0 -p1
# Get rid of bundled versions of boost and expat
rm -rf src/libboost
rm -rf src/libexpat
%build
-%{cmake} -DCMAKE_INSTALL_PREFIX=/usr \
+%if %{defined fedora}
+mkdir build
+cd build
+%endif
+%if %{undefined cmake}
+%define cmake cmake
+mkdir build
+cd build
+%endif
+%{cmake} \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DWITH_RC_FILES=OFF \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
@@ -96,3 +108,5 @@
%{_includedir}/votca/
%{_libdir}/libvotca_tools.so
%{_libdir}/pkgconfig/libvotca_tools.pc
+
+%changelog
++++++ votca-tools-1.2.3_pristine.tar.gz -> votca-tools-1.2.4_pristine.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-tools-1.2.3/CMakeLists.txt new/votca-tools-1.2.4/CMakeLists.txt
--- old/votca-tools-1.2.3/CMakeLists.txt 2012-08-15 06:26:25.000000000 +0200
+++ new/votca-tools-1.2.4/CMakeLists.txt 2014-08-31 23:54:51.000000000 +0200
@@ -2,7 +2,7 @@
project(votca-tools)
-set(PROJECT_VERSION "1.2.3")
+set(PROJECT_VERSION "1.2.4")
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}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-tools-1.2.3/include/votca/tools/tokenizer.h new/votca-tools-1.2.4/include/votca/tools/tokenizer.h
--- old/votca-tools-1.2.3/include/votca/tools/tokenizer.h 2012-08-15 06:26:25.000000000 +0200
+++ new/votca-tools-1.2.4/include/votca/tools/tokenizer.h 2014-08-31 23:54:51.000000000 +0200
@@ -93,8 +93,10 @@
std::vectorstd::string tmp;
ToVector(tmp);
v.resize(tmp.size());
- transform(tmp.begin(), tmp.end(), v.begin(),
- boost::lexical_cast);
+ typename std::vector<T>::iterator viter = v.begin();
+ typename std::vectorstd::string::iterator iter;
+ for(iter = tmp.begin(); iter!=tmp.end(); ++iter, ++viter)
+ *viter = boost::lexical_cast(*iter);
}
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-tools-1.2.3/src/libtools/cubicspline.cc new/votca-tools-1.2.4/src/libtools/cubicspline.cc
--- old/votca-tools-1.2.3/src/libtools/cubicspline.cc 2012-08-15 06:26:25.000000000 +0200
+++ new/votca-tools-1.2.4/src/libtools/cubicspline.cc 2014-08-31 23:54:51.000000000 +0200
@@ -32,6 +32,9 @@
if(x.size() != y.size())
throw std::invalid_argument("error in CubicSpline::Interpolate : sizes of vectors x and y do not match");
+ if(x.size()<3)
+ throw std::invalid_argument("error in CubicSpline::Interpolate : vectors x and y have to contain at least 3 points");
+
const int N = x.size();
// adjust the grid
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/votca-tools-1.2.3/src/libtools/linspline.cc new/votca-tools-1.2.4/src/libtools/linspline.cc
--- old/votca-tools-1.2.3/src/libtools/linspline.cc 2012-08-15 06:26:25.000000000 +0200
+++ new/votca-tools-1.2.4/src/libtools/linspline.cc 2014-08-31 23:54:51.000000000 +0200
@@ -31,6 +31,9 @@
if(x.size() != y.size())
throw std::invalid_argument("error in LinSpline::Interpolate : sizes of vectors x and y do not match");
+ if(x.size()<2)
+ throw std::invalid_argument("error in LinSpline::Interpolate : vectors x and y have to contain at least 2 points");
+
const int N = x.size();
// adjust the grid
@@ -98,5 +101,4 @@
b(i) = -a(i)*_r(i) + sol(i);
}
}
-
}}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
