Update to 0.13.1 (incompatible API/ABI bump!); drop upstreamed fixes;

disable examples due to build failures.
2008-07-15 02:56:14 +00:00 · 2008-07-15 02:56:14 +00:00 · d8e0261730
commit d8e0261730
parent 5199df1505
4 changed files with 49 additions and 84 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-libtorrent-0.12.1.tar.gz
+libtorrent-rasterbar-0.13.1.tar.gz
--- a/rb_libtorrent-gcc43.patch
+++ b/rb_libtorrent-gcc43.patch
@ -1,46 +0,0 @@
-diff -up ./src/file.cpp.old ./src/file.cpp
--- ./src/file.cpp.old	2008-02-14 20:53:03.000000000 -0800
-+++ ./src/file.cpp	2008-02-14 20:53:14.000000000 -0800
-@@ -66,6 +66,7 @@ BOOST_STATIC_ASSERT(sizeof(lseek(0, 0, 0
- #include <boost/filesystem/operations.hpp>
- #include "libtorrent/file.hpp"
- #include <sstream>
-+#include <cstring>
- 
- #ifndef O_BINARY
- #define O_BINARY 0
-diff -up ./include/libtorrent/buffer.hpp.old ./include/libtorrent/buffer.hpp
--- ./include/libtorrent/buffer.hpp.old	2008-02-14 20:50:39.000000000 -0800
-+++ ./include/libtorrent/buffer.hpp	2008-02-14 20:50:59.000000000 -0800
-@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
- 
- #include "libtorrent/invariant_check.hpp"
- #include <memory>
-+#include <cstring>
- 
- namespace libtorrent {
- 
-diff -up ./include/libtorrent/peer_id.hpp.old ./include/libtorrent/peer_id.hpp
--- ./include/libtorrent/peer_id.hpp.old	2008-02-14 20:53:41.000000000 -0800
-+++ ./include/libtorrent/peer_id.hpp	2008-02-14 20:54:02.000000000 -0800
-@@ -39,6 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
- #include <cctype>
- #include <algorithm>
- #include <string>
-+#include <cstring>
- 
- #include "libtorrent/config.hpp"
- 
-diff -up ./include/libtorrent/file.hpp.old ./include/libtorrent/file.hpp
-diff -up ./include/libtorrent/asio/detail/pipe_select_interrupter.hpp.old ./include/libtorrent/asio/detail/pipe_select_interrupter.hpp
--- ./include/libtorrent/asio/detail/pipe_select_interrupter.hpp.old	2008-02-14 20:49:42.000000000 -0800
-+++ ./include/libtorrent/asio/detail/pipe_select_interrupter.hpp	2008-02-14 20:50:09.000000000 -0800
-@@ -32,6 +32,8 @@
- #include "asio/system_error.hpp"
- #include "asio/detail/socket_types.hpp"
- 
-+#include <cstring>
-+
- namespace asio {
- namespace detail {
- 
--- a/rb_libtorrent.spec
+++ b/rb_libtorrent.spec
@ -1,5 +1,5 @@
 Name:		rb_libtorrent
-Version:	0.12.1
+Version:	0.13.1
 Release:	1%{?dist}
 Summary:	A C++ BitTorrent library aiming to be the best alternative

@ -7,15 +7,14 @@ Group:		System Environment/Libraries
 License:	BSD
 URL:		http://www.rasterbar.com/products/libtorrent/

-Source0:	http://www.libtorrent.org/libtorrent-%{version}.tar.gz
+Source0:	http://www.libtorrent.org/libtorrent-rasterbar-%{version}.tar.gz
 Source1:	%{name}-README-renames.Fedora
 Source2:	%{name}-COPYING.Boost
 Source3:	%{name}-COPYING.zlib

-Patch0: 	%{name}-gcc43.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

+BuildRequires:	asio-devel
 BuildRequires:	boost-devel
 BuildRequires:	zlib-devel
 BuildRequires:	libtool
@ -38,7 +37,7 @@ Group:		Development/Libraries
 License:	BSD and zlib/libpng License and Boost Software License
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-## Same pkgconfig file, and unsuffixed shared library symlink. :(
+## Same include directory. :(
 Conflicts:	libtorrent-devel
 ## Needed for various headers used via #include directives...
 Requires:	boost-devel
@ -55,26 +54,22 @@ licenses, as well as the comments blocks in the source code for which license
 a given source or header file is released under.


-%package	examples
-Summary:	Example clients using %{name}
-Group:		Applications/Internet
-License:	BSD
-Requires:	%{name} = %{version}-%{release}

-%description	examples
-The %{name}-examples package contains example clients which intend to
-show how to make use of its various features. (Due to potential
-namespace conflicts, a couple of the examples had to be renamed. See the
-included documentation for more details.)
+#package	examples
+#Summary:	Example clients using %{name}
+#Group:		Applications/Internet
+#License:	BSD
+#Requires:	%{name} = %{version}-%{release}
+
+#description	examples
+#The %{name}-examples package contains example clients which intend to
+#show how to make use of its various features. (Due to potential
+#namespace conflicts, a couple of the examples had to be renamed. See the
+#included documentation for more details.)


 %prep
-%setup -q -n "libtorrent-%{version}"
-%patch0 -p0 -b .gcc43
-## Some of the sources and docs are executable, which makes rpmlint against
-## the resulting -debuginfo and -devel packages, respectively, quite angry. :]
-find src/ docs/ -type f -exec chmod a-x '{}' \;
-find . -type f -regex '.*\.[hc]pp' -exec chmod a-x '{}' \;
+%setup -q -n "libtorrent-rasterbar-%{version}"
 ## The RST files are the sources used to create the final HTML files; and are
 ## not needed.
 rm -f docs/*.rst
@ -82,18 +77,24 @@ rm -f docs/*.rst
 install -p -m 0644 COPYING COPYING.BSD
 install -p -m 0644 %{SOURCE2} COPYING.Boost
 install -p -m 0644 %{SOURCE3} COPYING.zlib
-## Fix the installed pkgconfig file: we don't need linkage that the
-## libtorrent DSO already ensures. 
-sed -i -e 's/^Libs:.*$/Libs: -L${libdir} -ltorrent/' libtorrent.pc.in 
+## Finally, ensure that everything is UTF-8, as it should be.
+iconv -t UTF-8 -f ISO_8859-15 AUTHORS -o AUTHORS.iconv
+mv AUTHORS.iconv AUTHORS


 %build
-%configure --disable-static --enable-examples --with-zlib=system	\
-	--with-boost-date-time=boost_date_time-mt 			\
-	--with-boost-filesystem=boost_filesystem-mt			\
-	--with-boost-thread=boost_thread-mt				\
-	--with-boost-regex=boost_regex-mt				\
-	--with-boost-program_options=boost_program_options-mt
+## XXX: Even with the --with-asio=system configure option, the stuff in
+## the local include directory overrides that of the system. We don't like
+## local copies of system code. :)
+rm -rf include/libtorrent/asio*
+## FIXME: The examples currently fail to build (missing Makefile.in)
+%configure --disable-static --with-zlib=system		\
+	--with-boost-date-time=mt 			\
+	--with-boost-thread=mt				\
+	--with-boost-regex=mt				\
+	--with-boost-program_options=mt			\
+	--with-boost-filesystem=mt			\
+	--with-asio=system
 ## Use the system libtool to ensure that we don't get unnecessary RPATH
 ## hacks in our final build.
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
@ -127,7 +128,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %exclude %{_libdir}/*.la
-%{_libdir}/libtorrent-%{version}.so
+%{_libdir}/libtorrent-rasterbar.so.*
 ## Unfortunately (even with the "--disable-static" option to the %%configure
 ## invocation) our use of the system libtool creates static libraries at build
 ## time, so we must exclude them here.
@ -136,16 +137,26 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %doc COPYING.Boost COPYING.BSD COPYING.zlib docs/ 
-%{_libdir}/pkgconfig/libtorrent.pc
+%{_libdir}/pkgconfig/libtorrent-rasterbar.pc
 %{_includedir}/libtorrent/
-%{_libdir}/libtorrent.so
+%{_libdir}/libtorrent-rasterbar.so

-%files examples
-%doc COPYING README-renames.Fedora
-%{_bindir}/*torrent*
+## Build failures...
+#files examples
+#doc COPYING README-renames.Fedora
+#{_bindir}/*torrent*


 %changelog
+* Mon Jul 14 2008 Peter Gordon <peter@thecodergeek.com> - 0.13.1-1
+- Update to new upstream release (0.13.1): Contains an incompatible ABI/API
+  bump.
+- Drop GCC 4.3 patch (fixed upstream):
+  - gcc43.patch
+- Disable building the examples for now. (Attempted builds fail due to missing
+  Makefile support.) 
+- Drop the source permissions and pkgconfig file tweaks (fixed upstream).
+
 * Sat Feb 09 2008 Peter Gordon <peter@thecodergeek.com> - 0.12.1-1
 - Update to new upstream bug-fix release (0.12.1)
 - Rebuild for GCC 4.3
--- a/2
+++ b/2
@ -1 +1 @@
-1be3c3751673f751015b260836437f2e  libtorrent-0.12.1.tar.gz
+9d6b112fedc5861402647ff72e95dba0  libtorrent-rasterbar-0.13.1.tar.gz