rpms/qbittorrent/F-13 qtsinglecoreapp.patch, NONE, 1.1 qbittorrent.spec, 1.104, 1.105

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27059

Modified Files:
	qbittorrent.spec 
Added Files:
	qtsinglecoreapp.patch 
Log Message:
* Thu Jul 22 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.2.11-1
- update to 2.2.11
- use system qtsinglecoreapplication and qtsingleapplication libs
- add Br qtsinglecoreapplication-devel
- add Br qtsingleapplication-devel
- add patch so nox uses qtsinglecoreapplication


qtsinglecoreapp.patch:
 src.pro |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE qtsinglecoreapp.patch ---
Index: src/src.pro
===================================================================
--- src/src.pro	(revision 4281)
+++ src/src.pro	(working copy)
@@ -348,7 +348,11 @@
 
 contains(DEFINES, USE_SYSTEM_QTSINGLEAPPLICATION) {
   message("Using the system's qtsingleapplication library")
-  CONFIG += qtsingleapplication
+  contains(DEFINES, DISABLE_GUI) {
+    CONFIG += qtsinglecoreapplication
+  } else {
+    CONFIG += qtsingleapplication
+  }
 } else {
   message("Using the shipped qtsingleapplication library")
   contains(DEFINES, DISABLE_GUI) {


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/F-13/qbittorrent.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- qbittorrent.spec	20 Jul 2010 14:26:21 -0000	1.104
+++ qbittorrent.spec	22 Jul 2010 14:04:56 -0000	1.105
@@ -2,8 +2,8 @@
 
 Name:    qbittorrent
 Summary: A Bittorrent Client 
-Version: 2.2.8
-Release: 2%{?dist}
+Version: 2.2.11
+Release: 1%{?dist}
 Epoch:   1
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -17,6 +17,7 @@ Source1: qbittorrent-nox.README
 Patch0:  disable_extra_debug.patch
 
 # Upstream patches
+Patch2:  qtsinglecoreapp.patch
 
 
 URL: http://sourceforge.net/projects/qbittorrent
@@ -31,6 +32,7 @@ BuildRequires: rb_libtorrent-devel >= 0.
 BuildRequires: glib2-devel
 BuildRequires: libnotify-devel
 BuildRequires: GeoIP-devel
+BuildRequires: qtsingleapplication-devel
 
 
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -42,6 +44,7 @@ It aims to be as fast as possible and to
 %package nox
 Summary: A Headless Bittorrent Client
 Group: Applications/Internet
+BuildRequires: qtsinglecoreapplication-devel
 
 %description nox
 A Headless Bittorrent client using rb_libtorrent.
@@ -51,6 +54,7 @@ It aims to be as fast as possible and to
 %setup -q
 #%patch0 -p1 -b .disable_extra_debug
 # Upstream patches
+%patch2 -p0 -b .qtsinglecoreapp
 
 
 cp -p %{SOURCE1} .
@@ -60,7 +64,7 @@ cp -p %{SOURCE1} .
 # configure and make headless first
 mkdir -p build-nox
 cd build-nox
-../configure --prefix=%{_prefix} --disable-gui
+../configure --prefix=%{_prefix} --disable-gui --with-qtsingleapplication=system
 cp conf.pri ..
 make %{?_smp_mflags}
 mv -f ../conf.pri ../conf.pri.nox
@@ -68,7 +72,7 @@ mv -f ../conf.pri ../conf.pri.nox
 cd ..
 mkdir -p build-gui
 cd build-gui
-../configure --prefix=%{_prefix}
+../configure --prefix=%{_prefix} --with-qtsingleapplication=system
 cp conf.pri ..
 make %{?_smp_mflags}
 mv -f ../conf.pri ../conf.pri.gui
@@ -125,6 +129,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Jul 22 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.2.11-1
+- update to 2.2.11
+- use system qtsinglecoreapplication and qtsingleapplication libs
+- add Br qtsinglecoreapplication-devel
+- add Br qtsingleapplication-devel
+- add patch so nox uses qtsinglecoreapplication
+
 * Tue Jul 20 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.2.8-2
 - add epoch and revert version to 2.2.8 as the newer versions violate the
   bundled libs guidelines