From 59ee52aba22365b57d3c79f6b05611ac4bdd686aa56fb4d8e8b1730472fc2aac Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 18 Feb 2013 12:51:03 +0000 Subject: [PATCH] Accepting request 155718 from devel:libraries:c_c++ - Update to new upstream release 0.13.3 * No changelog provided * Required by rtorrent-0.9.3 - Use more robust make install call - Build with -fno-strict-aliasing because the code is scaredly full of type punning dereferences (reflected in the build log). - Remove libtorrent-decls.diff, libtorrent-gcc4.3-0.12.2.patch: issues resolved upstream (forwarded request 155673 from jengelh) OBS-URL: https://build.opensuse.org/request/show/155718 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libtorrent?expand=0&rev=4 --- libtorrent-0.12.2.tar.bz2 | 3 -- libtorrent-0.13.3.tar.xz | 3 ++ libtorrent-decls.diff | 87 ------------------------------ libtorrent-gcc4.3-0.12.2.patch | 97 ---------------------------------- libtorrent.changes | 12 +++++ libtorrent.spec | 32 +++++------ 6 files changed, 32 insertions(+), 202 deletions(-) delete mode 100644 libtorrent-0.12.2.tar.bz2 create mode 100644 libtorrent-0.13.3.tar.xz delete mode 100644 libtorrent-decls.diff delete mode 100644 libtorrent-gcc4.3-0.12.2.patch diff --git a/libtorrent-0.12.2.tar.bz2 b/libtorrent-0.12.2.tar.bz2 deleted file mode 100644 index e666f0a..0000000 --- a/libtorrent-0.12.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:310a3d42b828cabd8cdb8fcfb1c737feba26a7e7bd3da0ed9145c04239a5c9b9 -size 411023 diff --git a/libtorrent-0.13.3.tar.xz b/libtorrent-0.13.3.tar.xz new file mode 100644 index 0000000..4fbdfb2 --- /dev/null +++ b/libtorrent-0.13.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a50fcd1337942e48b0856ff572a67b2ec52d15032092ebd0c4b3a1d0475461cb +size 464136 diff --git a/libtorrent-decls.diff b/libtorrent-decls.diff deleted file mode 100644 index 8ecf62a..0000000 --- a/libtorrent-decls.diff +++ /dev/null @@ -1,87 +0,0 @@ -From: Jan Engelhardt -Date: 2012-01-31 11:09:58.559664592 +0100 - -Fix build errors regarding unknown snprintf, std::scanf, -ptrdiff_t, NULL. - ---- - src/data/memory_chunk.cc | 1 + - src/protocol/extensions.cc | 1 + - src/torrent/data/block.h | 1 + - src/torrent/data/block_transfer.h | 1 + - src/tracker/tracker_dht.cc | 1 + - src/tracker/tracker_udp.cc | 1 + - 6 files changed, 6 insertions(+) - -Index: libtorrent-0.12.2/src/data/memory_chunk.cc -=================================================================== ---- libtorrent-0.12.2.orig/src/data/memory_chunk.cc -+++ libtorrent-0.12.2/src/data/memory_chunk.cc -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include - #include - - #include -Index: libtorrent-0.12.2/src/protocol/extensions.cc -=================================================================== ---- libtorrent-0.12.2.orig/src/protocol/extensions.cc -+++ libtorrent-0.12.2/src/protocol/extensions.cc -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include - #include - #include - -Index: libtorrent-0.12.2/src/torrent/data/block.h -=================================================================== ---- libtorrent-0.12.2.orig/src/torrent/data/block.h -+++ libtorrent-0.12.2/src/torrent/data/block.h -@@ -37,6 +37,7 @@ - #ifndef LIBTORRENT_BLOCK_H - #define LIBTORRENT_BLOCK_H - -+#include - #include - #include - #include -Index: libtorrent-0.12.2/src/torrent/data/block_transfer.h -=================================================================== ---- libtorrent-0.12.2.orig/src/torrent/data/block_transfer.h -+++ libtorrent-0.12.2/src/torrent/data/block_transfer.h -@@ -37,6 +37,7 @@ - #ifndef LIBTORRENT_BLOCK_TRANSFER_H - #define LIBTORRENT_BLOCK_TRANSFER_H - -+#include - #include - #include - -Index: libtorrent-0.12.2/src/tracker/tracker_dht.cc -=================================================================== ---- libtorrent-0.12.2.orig/src/tracker/tracker_dht.cc -+++ libtorrent-0.12.2/src/tracker/tracker_dht.cc -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include - #include - - #include "dht/dht_router.h" -Index: libtorrent-0.12.2/src/tracker/tracker_udp.cc -=================================================================== ---- libtorrent-0.12.2.orig/src/tracker/tracker_udp.cc -+++ libtorrent-0.12.2/src/tracker/tracker_udp.cc -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include - #include - #include - diff --git a/libtorrent-gcc4.3-0.12.2.patch b/libtorrent-gcc4.3-0.12.2.patch deleted file mode 100644 index b68d553..0000000 --- a/libtorrent-gcc4.3-0.12.2.patch +++ /dev/null @@ -1,97 +0,0 @@ -Index: rak/functional.h -=================================================================== ---- rak/functional.h.orig 2008-05-07 14:19:14.000000000 +0200 -+++ rak/functional.h 2009-05-09 17:00:38.000000000 +0200 -@@ -37,6 +37,7 @@ - #ifndef RAK_FUNCTIONAL_H - #define RAK_FUNCTIONAL_H - -+#include - #include - - namespace rak { -Index: src/data/chunk.cc -=================================================================== ---- src/data/chunk.cc.orig 2008-05-07 14:19:13.000000000 +0200 -+++ src/data/chunk.cc 2009-05-09 17:00:24.000000000 +0200 -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include - #include - #include - -Index: src/data/chunk_list.h -=================================================================== ---- src/data/chunk_list.h.orig 2008-05-07 14:19:13.000000000 +0200 -+++ src/data/chunk_list.h 2009-05-09 17:01:02.000000000 +0200 -@@ -38,6 +38,7 @@ - #define LIBTORRENT_DATA_CHUNK_LIST_H - - #include -+#include - #include - #include - -Index: src/net/address_list.cc -=================================================================== ---- src/net/address_list.cc.orig 2008-05-07 14:19:12.000000000 +0200 -+++ src/net/address_list.cc 2009-05-09 17:01:29.000000000 +0200 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include -+ - #include - - #include "download/download_info.h" // for SocketAddressCompact -Index: src/torrent/data/file_list_iterator.h -=================================================================== ---- src/torrent/data/file_list_iterator.h.orig 2008-05-07 14:19:13.000000000 +0200 -+++ src/torrent/data/file_list_iterator.h 2009-05-09 17:02:03.000000000 +0200 -@@ -37,6 +37,7 @@ - #ifndef LIBTORRENT_FILE_LIST_ITERATOR_H - #define LIBTORRENT_FILE_LIST_ITERATOR_H - -+#include - #include - #include - -Index: src/torrent/exceptions.cc -=================================================================== ---- src/torrent/exceptions.cc.orig 2008-05-07 14:19:13.000000000 +0200 -+++ src/torrent/exceptions.cc 2009-05-09 17:02:28.000000000 +0200 -@@ -37,6 +37,7 @@ - #include "config.h" - - #include -+#include - - #include "exceptions.h" - -Index: src/torrent/tracker_list.h -=================================================================== ---- src/torrent/tracker_list.h.orig 2008-05-07 14:19:13.000000000 +0200 -+++ src/torrent/tracker_list.h 2009-05-09 17:02:51.000000000 +0200 -@@ -38,6 +38,7 @@ - #define LIBTORRENT_TRACKER_LIST_H - - #include -+#include - #include - #include - -Index: src/utils/diffie_hellman.cc -=================================================================== ---- src/utils/diffie_hellman.cc.orig 2008-05-07 14:19:12.000000000 +0200 -+++ src/utils/diffie_hellman.cc 2009-05-09 17:03:16.000000000 +0200 -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include - #include - - #ifdef USE_OPENSSL diff --git a/libtorrent.changes b/libtorrent.changes index 2d6b23e..855ee85 100644 --- a/libtorrent.changes +++ b/libtorrent.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 8 03:40:09 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 0.13.3 +* No changelog provided +* Required by rtorrent-0.9.3 +- Use more robust make install call +- Build with -fno-strict-aliasing because the code is scaredly + full of type punning dereferences (reflected in the build log). +- Remove libtorrent-decls.diff, libtorrent-gcc4.3-0.12.2.patch: + issues resolved upstream + ------------------------------------------------------------------- Wed Mar 7 09:29:56 UTC 2012 - cfarrell@suse.com diff --git a/libtorrent.spec b/libtorrent.spec index 6bcc9b1..d7a4020 100644 --- a/libtorrent.spec +++ b/libtorrent.spec @@ -1,7 +1,7 @@ # # spec file for package libtorrent # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,23 +14,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define soname 9 + Name: libtorrent -Version: 0.12.2 -Release: 1.0 +Version: 0.13.3 +Release: 0 +%define soname 17 +Summary: A BitTorrent library written in C++ for *nix +License: SUSE-GPL-2.0+-with-openssl-exception +Group: Productivity/Networking/File-Sharing Url: http://libtorrent.rakshasa.no/ -Source: %{name}-%{version}.tar.bz2 -Patch1: libtorrent-gcc4.3-0.12.2.patch -Patch2: libtorrent-decls.diff + +#Git-Clone: git://github.com/rakshasa/libtorrent +Source: %name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: libsigc++2-devel BuildRequires: openssl-devel BuildRequires: pkg-config -Summary: A BitTorrent library written in C++ for *nix -License: SUSE-GPL-2.0+-with-openssl-exception -Group: Productivity/Networking/File Sharing +BuildRequires: xz %description LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code. The library differentiates itself from other implementations by transfering directly from file pages to the network stack. On high-bandwidth connections it is able to seed at 3 times the speed of the official client. @@ -42,25 +44,25 @@ Group: System/Libraries %description -n %{name}%{soname} LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code. The library differentiates itself from other implementations by transfering directly from file pages to the network stack. On high-bandwidth connections it is able to seed at 3 times the speed of the official client. -%package -n %{name}-devel +%package devel Requires: %{name}%{soname} = %{version} Summary: A BitTorrent library written in C++ for *nix Group: Development/Libraries/C and C++ -%description -n %{name}-devel +%description devel LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code. The library differentiates itself from other implementations by transfering directly from file pages to the network stack. On high-bandwidth connections it is able to seed at 3 times the speed of the official client. %prep %setup -q -%patch -P 1 -p0 -%patch -P 2 -p1 %build +export CFLAGS="%optflags -fno-strict-aliasing" +export CXXFLAGS="$CFLAGS" %configure --enable-ipv6 --with-posix-fallocate make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR="%buildroot" find "%{buildroot}" -type f -name "*.la" -delete %post -n %{name}%{soname} -p /sbin/ldconfig