diff --git a/.gitignore b/.gitignore index 530de70..6f031f2 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /release-4.1.3.tar.gz /release-4.1.5.tar.gz /release-4.1.6.tar.gz +/release-4.1.7.tar.gz diff --git a/qbittorrent-3.3.5-boost-no-cxx11-ref-qualifiers.patch b/qbittorrent-3.3.5-boost-no-cxx11-ref-qualifiers.patch deleted file mode 100644 index 9d6d7b3..0000000 --- a/qbittorrent-3.3.5-boost-no-cxx11-ref-qualifiers.patch +++ /dev/null @@ -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 diff --git a/qbittorrent.spec b/qbittorrent.spec index 8128027..0ee171d 100644 --- a/qbittorrent.spec +++ b/qbittorrent.spec @@ -1,12 +1,7 @@ -%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.6 +Version: 4.1.7 Release: 1%{?dist} License: GPLv2+ URL: http://www.qbittorrent.org @@ -18,18 +13,15 @@ Source3: qmake-qt5.sh # 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) @@ -59,10 +51,7 @@ It aims to be as fast as possible and to provide multi-OS, unicode support. %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/org.qbittorrent.qBittorrent.desktop @@ -125,7 +114,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.qbittorren %files -%{!?_licensedir:%global license %doc} %license COPYING %doc README.md NEWS AUTHORS TODO Changelog %{_bindir}/qbittorrent @@ -146,6 +134,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.qbittorren %{_mandir}/man1/qbittorrent-nox.1* %changelog +* Mon Aug 05 2019 Leigh Scott - 1:4.1.7-1 +- Update to 4.1.7 +- Drop unused patch + * Tue May 07 2019 Leigh Scott - 1:4.1.6-1 - Update to 4.1.6 diff --git a/sources b/sources index 25dee8b..9123ddd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (release-4.1.6.tar.gz) = 14c337257a71a7a6f850bbbbe3effe6f34c299fe71486c1a71160f54ccc7377a5c8e742ca2fd85cf198b2a603fdfee50bdb19b33a10899f86f8499468ca8a735 +SHA512 (release-4.1.7.tar.gz) = 59fc6dc9696fbcfb9325017dcb5514f866e7f9e9eda9b4487c29c94d445709f1f3fab35f9817b62da75757360239362d77024d708eae48e89dffdde4ed272be4