#3 Update to 4.1.7
Merged 4 years ago by cstratak. Opened 4 years ago by cstratak.
rpms/ cstratak/qbittorrent f30  into  f30

Update to 4.1.7
Leigh Scott • 4 years ago  
Add BuildRequires pkgconfig(zlib)
Leigh Scott • 4 years ago  
Update to 4.1.6
Leigh Scott • 4 years ago  
file modified
+2
@@ -33,3 +33,5 @@ 

  /release-4.1.2.tar.gz

  /release-4.1.3.tar.gz

  /release-4.1.5.tar.gz

+ /release-4.1.6.tar.gz

+ /release-4.1.7.tar.gz

@@ -1,11 +0,0 @@ 

- diff -ur qBittorrent-release-3.3.5.orig/src/src.pro qBittorrent-release-3.3.5/src/src.pro

- --- qBittorrent-release-3.3.5.orig/src/src.pro	2016-06-27 22:54:12.000670896 +0100

- +++ qBittorrent-release-3.3.5/src/src.pro	2016-06-27 22:55:26.744992270 +0100

- @@ -5,6 +5,7 @@

-  # C++11 support

-  CONFIG += c++11

-  DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES

- +DEFINES += BOOST_NO_CXX11_REF_QUALIFIERS

-  greaterThan(QT_MAJOR_VERSION, 4): greaterThan(QT_MINOR_VERSION, 1): DEFINES += QBT_USES_QT5

-  

-  # Windows specific configuration

file modified
+19 -23
@@ -1,13 +1,8 @@ 

- %global disable_boost_cxx11 1

- %if 0%{?fedora} > 22

- %global disable_boost_cxx11 0

- %endif

- 

  Name:    qbittorrent

  Summary: A Bittorrent Client

  Epoch:   1

- Version: 4.1.5

- Release: 2%{?dist}

+ Version: 4.1.7

+ Release: 1%{?dist}

  License: GPLv2+

  URL:     http://www.qbittorrent.org

  Source0: https://github.com/qbittorrent/qBittorrent/archive/release-%{version}.tar.gz
@@ -18,22 +13,20 @@ 

  # Patch0:  qbittorrent-3.3.5-remove_donate.patch

  # These flags are needed for the hardening feature. It's probably not interesting for upstream

  Patch1:  qbittorrent-3.3.11-build_flags.patch

- %if 0%{disable_boost_cxx11}

- # Disable BOOST CXX11 REF QUALIFIERS (see https://github.com/qbittorrent/qBittorrent/issues/4112)

- Patch2:  qbittorrent-3.3.5-boost-no-cxx11-ref-qualifiers.patch

- %endif

  # disable silent qmake config, enable verbose build

- Patch3:  qbittorrent-3.3.1-verbose_build.patch

+ Patch2:  qbittorrent-3.3.1-verbose_build.patch

  

  

  # See https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot

  BuildRequires: gcc-c++

  

- BuildRequires: automake libtool

+ BuildRequires: automake

+ BuildRequires: libtool

  BuildRequires: systemd

  BuildRequires: pkgconfig(Qt5Core) >= 5.5

  BuildRequires: pkgconfig(Qt5Gui)

  BuildRequires: pkgconfig(Qt5Svg)

+ BuildRequires: pkgconfig(zlib)

  BuildRequires: qt5-linguist

  BuildRequires: qtsingleapplication-qt5-devel

  BuildRequires: qtsinglecoreapplication-qt5-devel
@@ -58,13 +51,10 @@ 

  %setup -qn qBittorrent-release-%{version}

  # %patch0 -p1

  %patch1 -p1

- %if 0%{disable_boost_cxx11}

- %patch2 -p1

- %endif

- %patch3 -p1 -b .verbose_build

+ %patch2 -p1 -b .verbose_build

  ./bootstrap.sh

  cp -p %{SOURCE1} .

- sed -i -e 's@Exec=qbittorrent %U@Exec=env TMPDIR=/var/tmp qbittorrent %U@g' dist/unix/qbittorrent.desktop

+ sed -i -e 's@Exec=qbittorrent %U@Exec=env TMPDIR=/var/tmp qbittorrent %U@g' dist/unix/org.qbittorrent.qBittorrent.desktop

  

  %build

  %set_build_flags
@@ -118,18 +108,17 @@ 

  

  desktop-file-install \

    --dir=%{buildroot}%{_datadir}/applications/ \

-   %{buildroot}%{_datadir}/applications/qbittorrent.desktop

+   %{buildroot}%{_datadir}/applications/org.qbittorrent.qBittorrent.desktop

  

- appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/qbittorrent.appdata.xml

+ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.qbittorrent.qBittorrent.appdata.xml

  

  

  %files

- %{!?_licensedir:%global license %doc}

  %license COPYING

  %doc README.md NEWS AUTHORS TODO Changelog

  %{_bindir}/qbittorrent

- %{_datadir}/appdata/qbittorrent.appdata.xml

- %{_datadir}/applications/qbittorrent.desktop

+ %{_metainfodir}/org.qbittorrent.qBittorrent.appdata.xml

+ %{_datadir}/applications/org.qbittorrent.qBittorrent.desktop

  %{_datadir}/icons/hicolor/*/apps/qbittorrent.png

  %{_datadir}/icons/hicolor/*/status/qbittorrent-tray.png

  %{_datadir}/icons/hicolor/*/status/qbittorrent-tray*.svg
@@ -145,6 +134,13 @@ 

  %{_mandir}/man1/qbittorrent-nox.1*

  

  %changelog

+ * Mon Aug 05 2019 Leigh Scott <leigh123linux@gmail.com> - 1:4.1.7-1

+ - Update to 4.1.7

+ - Drop unused patch

+ 

+ * Tue May 07 2019 Leigh Scott <leigh123linux@gmail.com> - 1:4.1.6-1

+ - Update to 4.1.6

+ 

  * Thu Jan 31 2019 Kalev Lember <klember@redhat.com> - 1:4.1.5-2

  - Rebuilt for Boost 1.69

  

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

- SHA512 (release-4.1.5.tar.gz) = e090ecc9343ff94874a6d54d487a672dcd44a943da4e2d625b5f7db849c861173c12c870f4d7f0843a60fdffd1fbbd74d05d48223bd3ebf32b7a1ef478c95dec

+ SHA512 (release-4.1.7.tar.gz) = 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4