diff --git a/sources b/sources index b76e390..a5e2595 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b98eef2c356b73e586a40a93896fb423 votca-tools-1.2.3_pristine.tar.gz +f6b1efc6fa3b5c787846f7833ce8e467 votca-tools-1.2.4_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 deleted file mode 100644 index 4aa7adb..0000000 --- a/votca-tools-1.2.3-boost-1.53.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User Victor Ruehle -# 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 tmp; - ToVector(tmp); - v.resize(tmp.size()); -- transform(tmp.begin(), tmp.end(), v.begin(), -- boost::lexical_cast); -+ typename std::vector::iterator viter = v.begin(); -+ typename std::vector::iterator iter; -+ for(iter = tmp.begin(); iter!=tmp.end(); ++iter, ++viter) -+ *viter = boost::lexical_cast(*iter); - } - - private: diff --git a/votca-tools.spec b/votca-tools.spec index da120f2..7f5333d 100644 --- a/votca-tools.spec +++ b/votca-tools.spec @@ -1,13 +1,11 @@ Name: votca-tools -Version: 1.2.3 -Release: 6%{?dist} +Version: 1.2.4 +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) @@ -46,7 +44,6 @@ This package contains development headers and libraries for votca-tools. %prep %setup -q -%patch0 -p1 -b .boost153 %build mkdir %{_target_platform} @@ -78,6 +75,10 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libvotca_tools.pc %changelog +* Fri Sep 05 2014 Christoph Junghans - 1.2.4-1 +- Update to 1.2.4 +- Drop obsolete patch + * Mon Aug 18 2014 Fedora Release Engineering - 1.2.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild