#1 Update to 1.5
Merged 3 years ago by atim. Opened 3 years ago by kalev.
rpms/ kalev/fragments fragments-1.5  into  rawhide

file modified
+1
@@ -3,3 +3,4 @@ 

  /libnatpmp-4d3b9d8.tar.gz

  /dht-25e12bb.tar.gz

  /libutp-fda9f4b.tar.gz

+ /Fragments-1.5.tar.gz

file modified
+34 -9
@@ -18,8 +18,8 @@ 

  %global transmission_url https://github.com/transmission

  

  Name: fragments

- Version: 1.4

- Release: 19%{?dist}

+ Version: 1.5

+ Release: 1%{?dist}

  Summary: Easy to use BitTorrent client which follows the GNOME HIG

  

  # The entire source code is GPLv3+ except:
@@ -48,7 +48,7 @@ 

  BuildRequires: pkgconfig(gtk+-3.0)

  BuildRequires: pkgconfig(libcurl)

  BuildRequires: pkgconfig(libevent) >= 2.0.0

- BuildRequires: pkgconfig(libhandy-0.0)

+ BuildRequires: pkgconfig(libhandy-1)

  BuildRequires: pkgconfig(miniupnpc)

  BuildRequires: pkgconfig(openssl) >= 0.9.7

  BuildRequires: pkgconfig(zlib)
@@ -72,20 +72,41 @@ 

  %autosetup -n %{appname}-%{version} -D -T -a 3

  %autosetup -n %{appname}-%{version} -D -T -a 4

  

- mv transmission-transmission-%{transmission_shortcommit}/* \

-     /builddir/build/BUILD/%{appname}-%{version}/submodules/transmission

  mv transmission-libnatpmp-%{libnatpmp_shortcommit}/* \

-     /builddir/build/BUILD/%{appname}-%{version}/submodules/transmission/third-party/libnatpmp

+    transmission-transmission-%{transmission_shortcommit}/third-party/libnatpmp

  mv transmission-dht-%{dht_shortcommit}/* \

-     /builddir/build/BUILD/%{appname}-%{version}/submodules/transmission/third-party/dht

+    transmission-transmission-%{transmission_shortcommit}/third-party/dht

  mv transmission-libutp-%{libutp_shortcommit}/* \

-     /builddir/build/BUILD/%{appname}-%{version}/submodules/transmission/third-party/libutp

+    transmission-transmission-%{transmission_shortcommit}/third-party/libutp

  

  # Just to be sure libtransmission not compiles with bundled openssl

- rm -r /builddir/build/BUILD/%{appname}-%{version}/submodules/transmission/third-party/openssl

+ rm -r transmission-transmission-%{transmission_shortcommit}/third-party/openssl

  

  

  %build

+ # First build bundled libtransmission

+ pushd transmission-transmission-%{transmission_shortcommit}

+ %cmake \

+        -DINSTALL_LIB=ON \

+        -DENABLE_DAEMON=OFF \

+        -DENABLE_UTILS=OFF \

+        -DENABLE_TESTS=OFF \

+        -DENABLE_GTK=OFF \

+        -DENABLE_QT=OFF \

+        -DINSTALL_DOC=OFF \

+        %{nil}

+ %cmake_build

+ %cmake_install

+ popd

+ 

+ # Set up env variables so that Fragments build can find libtransmission and its bundled dependencies

+ export C_INCLUDE_PATH=%{buildroot}%{_includedir}

+ export LIBRARY_PATH=`pwd`/transmission-transmission-%{transmission_shortcommit}/%{__cmake_builddir}/libtransmission:$LIBRARY_PATH

+ export LIBRARY_PATH=`pwd`/transmission-transmission-%{transmission_shortcommit}/%{__cmake_builddir}/third-party/natpmp/lib:$LIBRARY_PATH

+ export LIBRARY_PATH=`pwd`/transmission-transmission-%{transmission_shortcommit}/%{__cmake_builddir}/third-party/dht/lib:$LIBRARY_PATH

+ export LIBRARY_PATH=`pwd`/transmission-transmission-%{transmission_shortcommit}/%{__cmake_builddir}/third-party/utp/lib:$LIBRARY_PATH

+ 

+ # And finally, build Fragments

  %meson

  %meson_build

  
@@ -111,6 +132,10 @@ 

  

  

  %changelog

+ * Thu Feb 25 2021 Kalev Lember <klember@redhat.com> - 1.5-1

+ - Update to 1.5

+ - Switch to libhandy-1

+ 

  * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-19

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

  

file modified
+1 -1
@@ -1,4 +1,4 @@ 

- SHA512 (Fragments-1.4.tar.gz) = f2c8e2153e85b9a8fedfea28862c74ad377ca75079f874d1e683a1848cd66bc79fee739d4986d2364a44f4dea8acd33b63b3ab94663884358d5ee41f5a068643

+ SHA512 (Fragments-1.5.tar.gz) = 45c25fa5ba0ea4cb3b2c123a27df9e80190deba4c00d13e6dc0a711523d80b3fd3296ed4021b2c0c21c6a47d2f9221a1ff2066f692770f6bec31efcf657922d0

  SHA512 (transmission-3d9fd25.tar.gz) = ed0fe66728add08a2cee9bfc6280f58dc4cb8770549e5aabbaee6220f499c1a48e8baf18168a593438c10093e9fc53a4c27f1e535235a5698136ba41023105ad

  SHA512 (libnatpmp-4d3b9d8.tar.gz) = 567f103be27f2dbb0719ceaff0d16338436717cac9fb2a0b62027c3480701a51edfb771f102854afd9ab9a4c5b41d2f2fdb1ede4811a4913b083c0b2d1c7ebfe

  SHA512 (dht-25e12bb.tar.gz) = a7fb1934e4c84c2e5cf5226ae734bac05863f28b2d27b0d046834e6244bd5aff84d7fe3dce09e3e5583170b3c1de74ccfb32d9a1144b1ced725ca583ea04cbae

This also means that we need to change the way how the bundled copy of
libtransmission is built. Previously, it was included as a git submodule
in fragments git, but that is no longer the case and we need to do a bit
more work to get it all correctly built.

Pull-Request has been merged by atim

3 years ago