[qbittorrent] fix bz 1072046

leigh123linux leigh123linux at fedoraproject.org
Sun Jun 22 14:42:58 UTC 2014


commit 654a147e186a4819ce62abac8965c4b9bd309cb9
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Jun 22 15:42:50 2014 +0100

    fix bz 1072046

 qbittorrent      |    4 ----
 qbittorrent.spec |   16 ++++++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/qbittorrent.spec b/qbittorrent.spec
index b2ea11d..1aafbb7 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -4,7 +4,7 @@
 Name:    qbittorrent
 Summary: A Bittorrent Client
 Version: 3.2.0
-Release: 0.2.git%{_internal_version}%{?dist}
+Release: 0.3.git%{_internal_version}%{?dist}
 Epoch:   1
 License: GPLv2+
 URL:     http://sourceforge.net/projects/qbittorrent
@@ -13,8 +13,7 @@ URL:     http://sourceforge.net/projects/qbittorrent
 Source0: http://leigh123linux.fedorapeople.org/pub/qbittorrent/source/%{name}-%{version}.git%{_internal_version}.tar.gz
 #Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.xz
 Source1: qbittorrent-nox.README
-Source2: qbittorrent
-Source3: qbittorrent-nox
+Source2: qbittorrent-nox
 
 Patch0:  build_flags.patch
 Patch1:  use_system_qjson.patch
@@ -52,6 +51,7 @@ It aims to be as fast as possible and to provide multi-OS, unicode support.
 rm -rf src/qtsingleapp
 rm -rf src/webui/qjson
 cp -p %{SOURCE1} .
+sed -i -e 's at Exec=qbittorrent %U at Exec=env TMPDIR=/var/tmp qbittorrent %U at g' src/Icons/qBittorrent.desktop
 
 %build
 # use ./configure instead of %%configure as it doesn't work
@@ -82,10 +82,8 @@ cd ..
 mv -f conf.pri.gui conf.pri
 cd build-gui
 make INSTALL_ROOT=$RPM_BUILD_ROOT install
-mv $RPM_BUILD_ROOT%{_bindir}/qbittorrent $RPM_BUILD_ROOT%{_bindir}/qbittorrent-bin
 mv $RPM_BUILD_ROOT%{_bindir}/qbittorrent-nox $RPM_BUILD_ROOT%{_bindir}/qbittorrent-nox-bin
-install -pm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/qbittorrent
-install -pm 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/qbittorrent-nox
+install -pm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/qbittorrent-nox
 
 
 desktop-file-install \
@@ -109,12 +107,11 @@ fi
 
 %files
 %doc README.md NEWS COPYING AUTHORS TODO Changelog
-%{_mandir}/man1/qbittorrent.1*
 %{_bindir}/qbittorrent
-%{_bindir}/qbittorrent-bin
 %{_datadir}/applications/qBittorrent.desktop
 %{_datadir}/icons/hicolor/*/apps/qbittorrent.png
 %{_datadir}/pixmaps/qbittorrent.png
+%{_mandir}/man1/qbittorrent.1*
 
 %files nox
 %doc qbittorrent-nox.README NEWS COPYING AUTHORS TODO Changelog
@@ -123,6 +120,9 @@ fi
 %{_mandir}/man1/qbittorrent-nox.1*
 
 %changelog
+* Sun Jun 22 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:3.2.0-0.3.gitd58d87a
+- fix bz 1072046
+
 * Sun Jun 08 2014 Leigh Scott <leigh123linux at googlemail.com> - 1:3.2.0-0.2.gitd58d87a
 - remove bundled qjson
 - patch to use system qjson


More information about the scm-commits mailing list