rpms/rb_libtorrent/devel rb_libtorrent-0.13.1-boost.patch, NONE, 1.1 rb_libtorrent.spec, 1.17, 1.18

[Petr Machata]

Author: pmachata

Update of /cvs/pkgs/rpms/rb_libtorrent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28731

Modified Files:
	rb_libtorrent.spec 
Added Files:
	rb_libtorrent-0.13.1-boost.patch 
Log Message:
- Rebuild for boost-1.37.0.


rb_libtorrent-0.13.1-boost.patch:

--- NEW FILE rb_libtorrent-0.13.1-boost.patch ---
--- 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 <boost/thread/thread.hpp>
 #include <boost/function.hpp>
+#include <boost/thread/condition.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/bind.hpp>
 #include <boost/pool/pool.hpp>
--- 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());


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rb_libtorrent.spec	17 Dec 2008 23:57:49 -0000	1.17
+++ rb_libtorrent.spec	19 Dec 2008 12:28:09 -0000	1.18
@@ -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 @@
 ## Sent upstream via the libtorrent-discuss ML.
 ## Message-Id: <1216701448.24546.11.camel at 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 @@
 
 %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 @@
 	--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 @@
 
 
 %changelog
+* Fri Dec 19 2008 Petr Machata <pmachata at redhat.com> - 0.13.1-7
+- Rebuild for boost-1.37.0.
+
 * Wed Dec 17 2008 Benjamin Kosnik  <bkoz at redhat.com> - 0.13.1-6
 - Rebuild for boost-1.37.0.