From 71c70132a8ca9996813b698ea3c767128432df86 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Dec 19 2008 12:28:09 +0000 Subject: - Rebuild for boost-1.37.0. --- diff --git a/rb_libtorrent-0.13.1-boost.patch b/rb_libtorrent-0.13.1-boost.patch new file mode 100644 index 0000000..334cd29 --- /dev/null +++ b/rb_libtorrent-0.13.1-boost.patch @@ -0,0 +1,39 @@ +--- Miro-1.2.6/portable/libtorrent/include/libtorrent/disk_io_thread.hpp.boost 2008-08-15 00:50:40.000000000 -0400 ++++ Miro-1.2.6/portable/libtorrent/include/libtorrent/disk_io_thread.hpp 2008-08-22 18:52:56.000000000 -0400 +@@ -37,6 +37,7 @@ + #include "libtorrent/storage.hpp" + #include + #include ++#include + #include + #include + #include +--- Miro-1.2.6/portable/libtorrent/src/torrent_info.cpp.boost 2008-08-15 00:50:41.000000000 -0400 ++++ Miro-1.2.6/portable/libtorrent/src/torrent_info.cpp 2008-08-22 18:06:31.000000000 -0400 +@@ -352,7 +352,7 @@ + { + m_name = tmp.leaf(); + } +- else if (tmp.has_branch_path()) ++ else if (tmp.has_parent_path()) + { + fs::path p; + for (fs::path::iterator i = tmp.begin() +@@ -556,7 +556,7 @@ + { + // TORRENT_ASSERT(file.begin() != file.end()); + +- if (!file.has_branch_path()) ++ if (!file.has_parent_path()) + { + // you have already added at least one file with a + // path to the file (branch_path), which means that +@@ -644,7 +644,7 @@ + fs::path const* file_path; + if (i->orig_path) file_path = &(*i->orig_path); + else file_path = &i->path; +- TORRENT_ASSERT(file_path->has_branch_path()); ++ TORRENT_ASSERT(file_path->has_parent_path()); + TORRENT_ASSERT(*file_path->begin() == m_name); + + for (fs::path::iterator j = boost::next(file_path->begin()); diff --git a/rb_libtorrent.spec b/rb_libtorrent.spec index 438687b..3de35b9 100644 --- a/rb_libtorrent.spec +++ b/rb_libtorrent.spec @@ -3,7 +3,7 @@ Name: rb_libtorrent Version: 0.13.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A C++ BitTorrent library aiming to be the best alternative Group: System Environment/Libraries @@ -19,6 +19,7 @@ Source3: %{name}-COPYING.zlib ## Sent upstream via the libtorrent-discuss ML. ## Message-Id: <1216701448.24546.11.camel@tuxhugs> Source4: %{name}-python-setup.py +Patch1: rb_libtorrent-0.13.1-boost.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -90,6 +91,7 @@ module) that allow it to be used from within Python applications. %prep %setup -q -n "libtorrent-rasterbar-%{version}" +%patch1 -p3 ## The RST files are the sources used to create the final HTML files; and are ## not needed. rm -f docs/*.rst @@ -116,6 +118,7 @@ rm -rf include/libtorrent/asio* --with-boost-regex=mt \ --with-boost-program_options=mt \ --with-boost-filesystem=mt \ + --with-boost-system=mt \ --with-asio=system ## Use the system libtool to ensure that we don't get unnecessary RPATH ## hacks in our final build. @@ -186,6 +189,9 @@ rm -rf %{buildroot} %changelog +* Fri Dec 19 2008 Petr Machata - 0.13.1-7 +- Rebuild for boost-1.37.0. + * Wed Dec 17 2008 Benjamin Kosnik - 0.13.1-6 - Rebuild for boost-1.37.0.