[votca-tools] Update to 1.2.3, fix build in rawhide.
Susi Lehtola
jussilehtola at fedoraproject.org
Sun Feb 10 19:16:29 UTC 2013
commit bd010ab8f4fd9671fce3f5a4203315028421c39b
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Sun Feb 10 21:16:21 2013 +0200
Update to 1.2.3, fix build in rawhide.
.gitignore | 1 +
sources | 2 +-
votca-tools-1.2.3-boost-1.53.patch | 24 ++++++++++++++++++++++++
votca-tools.spec | 11 +++++++++--
4 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 230cf28..a7048f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/votca-tools-1.0.1.tar.gz
/votca-tools-1.1_pristine.tar.gz
+/votca-tools-1.2.3_pristine.tar.gz
diff --git a/sources b/sources
index 97b3d51..b76e390 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-299abc18344cdcbd9b2949e0aa5a3e82 votca-tools-1.2.1_pristine.tar.gz
+b98eef2c356b73e586a40a93896fb423 votca-tools-1.2.3_pristine.tar.gz
diff --git a/votca-tools-1.2.3-boost-1.53.patch b/votca-tools-1.2.3-boost-1.53.patch
new file mode 100644
index 0000000..4aa7adb
--- /dev/null
+++ b/votca-tools-1.2.3-boost-1.53.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User Victor Ruehle <ruehle at votca.org>
+# Date 1359258783 25200
+# Branch stable
+# Node ID f26d7ee778d666babe7f58ae3770b4f3d997aa99
+# Parent d10dec78492a78ad6709e686416615fc8b43c896
+fix build with boost-1.53 (fixes issue 131)
+
+diff -r d10dec78492a -r f26d7ee778d6 include/votca/tools/tokenizer.h
+--- a/include/votca/tools/tokenizer.h Sun Dec 02 21:09:27 2012 -0700
++++ b/include/votca/tools/tokenizer.h Sat Jan 26 20:53:03 2013 -0700
+@@ -93,8 +93,10 @@
+ std::vector<std::string> tmp;
+ ToVector(tmp);
+ v.resize(tmp.size());
+- transform(tmp.begin(), tmp.end(), v.begin(),
+- boost::lexical_cast<T, std::string>);
++ typename std::vector<T>::iterator viter = v.begin();
++ typename std::vector<std::string>::iterator iter;
++ for(iter = tmp.begin(); iter!=tmp.end(); ++iter, ++viter)
++ *viter = boost::lexical_cast<T, std::string>(*iter);
+ }
+
+ private:
diff --git a/votca-tools.spec b/votca-tools.spec
index 0be358a..83feef2 100644
--- a/votca-tools.spec
+++ b/votca-tools.spec
@@ -1,11 +1,14 @@
Name: votca-tools
-Version: 1.2.1
-Release: 6%{?dist}.1
+Version: 1.2.3
+Release: 1%{?dist}
Summary: VOTCA tools library
Group: Applications/Engineering
License: ASL 2.0
URL: http://www.votca.org
Source0: http://votca.googlecode.com/files/%{name}-%{version}_pristine.tar.gz
+# Fix build against newer boost, already fixed upstream
+Patch0: votca-tools-1.2.3-boost-1.53.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -43,6 +46,7 @@ This package contains development headers and libraries for votca-tools.
%prep
%setup -q
+%patch0 -p1 -b .boost153
%build
mkdir %{_target_platform}
@@ -74,6 +78,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libvotca_tools.pc
%changelog
+* Sun Feb 10 2013 Susi Lehtola <jussilehtola at fedoraproject.org> - 1.2.3-1
+- Update to 1.2.3, fix build in rawhide.
+
* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1.2.1-6.1
- Rebuild for Boost-1.53.0
More information about the scm-commits
mailing list