From 578d6777023e6300636b47ee57aa1df01ec2867a Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Jun 08 2021 05:03:31 +0000 Subject: Update to 2.0.4 Remove RPATH from examples --- diff --git a/rb_libtorrent-python-sha256.patch b/rb_libtorrent-python-sha256.patch new file mode 100644 index 0000000..d5521e7 --- /dev/null +++ b/rb_libtorrent-python-sha256.patch @@ -0,0 +1,11 @@ +--- libtorrent-rasterbar-2.0.4/bindings/python/CMakeLists.txt.orig 2021-06-06 18:41:30.000000000 -0500 ++++ libtorrent-rasterbar-2.0.4/bindings/python/CMakeLists.txt 2021-06-07 22:24:11.620588750 -0500 +@@ -56,6 +56,8 @@ + src/session.cpp + src/session_settings.cpp + src/sha1_hash.cpp ++ src/sha256_hash.cpp ++ src/info_hash.cpp + src/string.cpp + src/torrent_handle.cpp + src/torrent_info.cpp diff --git a/rb_libtorrent.spec b/rb_libtorrent.spec index 38d234f..183f57a 100644 --- a/rb_libtorrent.spec +++ b/rb_libtorrent.spec @@ -5,8 +5,8 @@ %endif Name: rb_libtorrent -Version: 2.0.3 -Release: 2%{?dist} +Version: 2.0.4 +Release: 1%{?dist} Summary: A C++ BitTorrent library aiming to be the best alternative License: BSD @@ -16,6 +16,9 @@ Source1: %{name}-README-renames.Fedora Source2: %{name}-COPYING.Boost Source3: %{name}-COPYING.zlib +# Upstream missed adding a few source files to the CMake build files +Patch1: %{name}-python-sha256.patch + %if 0%{?rhel} && 0%{?rhel} < 8 # aarch64 is broken and I have zero interest in fixing it ExcludeArch: aarch64 @@ -110,6 +113,7 @@ Python applications. %prep %setup -q -n "libtorrent-rasterbar-%{version}" +%patch1 -p1 -b.python-sha256 ## The RST files are the sources used to create the final HTML files; and are ## not needed. @@ -131,6 +135,7 @@ pushd build %cmake3 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_SKIP_RPATH=TRUE \ -GNinja \ -Dbuild_examples=ON \ -Dbuild_tests=ON \ @@ -157,6 +162,7 @@ pushd build-python3 %cmake3 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_SKIP_RPATH=TRUE \ -GNinja \ -Dbuild_examples=ON \ -Dbuild_tests=ON \ @@ -174,6 +180,7 @@ popd %check %if 0%{?fedora} < 31 && 0%{?rhel} < 8 +export LD_LIBRARY_PATH=%{_builddir}/libtorrent-rasterbar-%{version}/build/%{_host} pushd build/%{_host}*/test # Skip UPnP test as it requires a UPnP server on the same network, others due to aarch64 failures echo "set (CTEST_CUSTOM_TESTS_IGNORE @@ -186,6 +193,7 @@ ctest %{?_smp_mflags} popd %endif %if 0%{?with_python3} +export LD_LIBRARY_PATH=%{_builddir}/libtorrent-rasterbar-%{version}/build-python3/%{_host} pushd build-python3/%{_host}*/test # Skip UPnP test as it requires a UPnP server on the same network, others due to aarch64 failures echo "set (CTEST_CUSTOM_TESTS_IGNORE @@ -275,6 +283,9 @@ install -p -m 0644 %{SOURCE1} ./README-renames.Fedora %endif # with python3 %changelog +* Mon Jun 07 2021 Michael Cronenworth - 2.0.4-1 +- Upgrade to 2.0.4 + * Fri Jun 04 2021 Python Maint - 2.0.3-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 9e36dd2..0843a2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtorrent-rasterbar-2.0.3.tar.gz) = 37211ac165db8542f8c2a29e28f4685b050a825c14d1f6328a4a96c2af1bc1bbf00d9dba4bc81c192f9b57ff358d1b27eeb7df7cebca5a2f751e6fb2bce3d257 +SHA512 (libtorrent-rasterbar-2.0.4.tar.gz) = 66ce3c3369b1d2a83654727c23022d38b070b8bc3ad83b1001e2cfad945acbaa4d61990094bc758886967cd305ca2213b60b1b0523b5106c42d4701d8cff8db1