From 54b249d9f45058014e1274ff87126a6f94d9f791 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Jan 17 2014 12:17:32 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/.gitignore b/.gitignore
index b44de0a..773c6e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /qBittorrent-release-3.1.0.tar.gz
 /qbittorrent-3.1.3.tar.xz
 /qbittorrent-3.1.4.tar.xz
+/qbittorrent-3.1.5.tar.xz
diff --git a/qbittorrent b/qbittorrent
new file mode 100644
index 0000000..d142089
--- /dev/null
+++ b/qbittorrent
@@ -0,0 +1,4 @@
+#!/bin/bash
+TMPDIR=/var/tmp
+export TMPDIR
+/usr/bin/qbittorrent-bin $*
diff --git a/qbittorrent-nox b/qbittorrent-nox
new file mode 100644
index 0000000..b4d98dd
--- /dev/null
+++ b/qbittorrent-nox
@@ -0,0 +1,4 @@
+#!/bin/bash
+TMPDIR=/var/tmp
+export TMPDIR
+/usr/bin/qbittorrent-nox-bin $*
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 7bc29ad..55e2cce 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -2,13 +2,15 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client
-Version: 3.1.4
-Release: 4%{?dist}
+Version: 3.1.5
+Release: 1%{?dist}
 Epoch:   1
 License: GPLv2+
 URL:     http://sourceforge.net/projects/qbittorrent
 Source0: http://downloads.sf.net/qbittorrent/%{name}-%{version}.tar.xz
 Source1: qbittorrent-nox.README
+Source2: qbittorrent
+Source3: qbittorrent-nox
 
 Patch0:  build_flags.patch
 
@@ -72,6 +74,10 @@ 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
 
 
 desktop-file-install \
@@ -97,6 +103,7 @@ fi
 %doc README 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
@@ -104,9 +111,16 @@ fi
 %files nox
 %doc qbittorrent-nox.README NEWS COPYING AUTHORS TODO Changelog
 %{_bindir}/qbittorrent-nox
+%{_bindir}/qbittorrent-nox-bin
 %{_mandir}/man1/qbittorrent-nox.1*
 
 %changelog
+* Fri Jan 17 2014 Leigh Scott <leigh123linux@googlemail.com> - 1:3.1.5-1
+- update to 3.1.5 release
+
+* Mon Jan 13 2014 Leigh Scott <leigh123linux@googlemail.com> - 1:3.1.4-5
+- add wrapping script to fix (bz 998265)
+
 * Fri Jan 10 2014 Leigh Scott <leigh123linux@googlemail.com> - 1:3.1.4-4
 - drop the _hardened_build global as it's crap
 
diff --git a/sources b/sources
index 42b55f3..157627e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85b93bbc2fc0110c7035ca3427494a80  qbittorrent-3.1.4.tar.xz
+f5199d6d5f84e09e67d55879f547caf9  qbittorrent-3.1.5.tar.xz