[q4wine/f13/master] Use system qtsingleapplication.

[Dmitrij S. Kryzhevich]

commit 5aadd62c9a71ab53a9b6a9c44a4c82c79c79f8c8
Author: Dmitrij S. Kryzhevich <krege at land.ru>
Date:   Wed Nov 10 11:40:23 2010 +0600

    Use system qtsingleapplication.

 q4wine-0.120-qtsingleapp.patch |   79 ++++++++++++++++++++++++++++++++++++++++
 q4wine.spec                    |    8 ++++-
 2 files changed, 86 insertions(+), 1 deletions(-)
---
diff --git a/q4wine-0.120-qtsingleapp.patch b/q4wine-0.120-qtsingleapp.patch
new file mode 100644
index 0000000..87ba0fc
--- /dev/null
+++ b/q4wine-0.120-qtsingleapp.patch
@@ -0,0 +1,79 @@
+diff -urp q4wine-0.120/src/CMakeLists.txt q4wine-0.120-qtsapp/src/CMakeLists.txt
+--- q4wine-0.120/src/CMakeLists.txt	2010-10-01 13:48:46.000000000 +0700
++++ q4wine-0.120-qtsapp/src/CMakeLists.txt	2010-11-10 10:53:35.204119808 +0600
+@@ -194,6 +194,15 @@ IF (${WITH_EMBEDDED_FUSEISO} MATCHES ON 
+     MESSAGE("\n")
+ ENDIF (${WITH_EMBEDDED_FUSEISO} MATCHES ON )
+ 
++# SingleApplication Library
++find_path(QTSINGLEAPPLIB_INCLUDE_DIR QtSingleApplication PATH_SUFFIXES QtSolutions)
++find_library(QTSINGLEAPPLIB QtSolutions_SingleApplication-2.6)
++IF( QTSINGLEAPPLIB_INCLUDE_DIR AND QTSINGLEAPPLIB )
++    message(STATUS "FOUND: SingleApplication Library")
++ELSE( QTSINGLEAPPLIB_INCLUDE_DIR AND QTSINGLEAPPLIB )
++    message(FATAL_ERROR "SingleApplication Library NOT FOUND! ${QTSINGLEAPPLIB_INCLUDE_DIR}")
++ENDIF( QTSINGLEAPPLIB_INCLUDE_DIR AND QTSINGLEAPPLIB )
++
+ SET ( Q4WINE_HEADERS_DIR
+     ${CMAKE_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR}/src
+@@ -205,7 +214,7 @@ SET ( Q4WINE_HEADERS_DIR
+     ${CMAKE_SOURCE_DIR}/src/q4wine-gui/widgets
+     ${CMAKE_SOURCE_DIR}/src/q4wine-gui/widgets/appdb
+     ${CMAKE_SOURCE_DIR}/src/plugins
+-    ${CMAKE_SOURCE_DIR}/src/qtsingleapplication
++    ${QTSINGLEAPPLIB_INCLUDE_DIR}
+ )
+ 
+ INCLUDE_DIRECTORIES( ${Q4WINE_HEADERS_DIR} ${CMAKE_BINARY_DIR} )
+@@ -218,7 +227,7 @@ IF (${WITH_EMBEDDED_FUSEISO} MATCHES ON 
+     add_subdirectory(fuseiso/src)
+ ENDIF (${WITH_EMBEDDED_FUSEISO} MATCHES ON )
+ 
+-add_subdirectory(qtsingleapplication)
++#add_subdirectory(qtsingleapplication)
+ 
+ include(plugins/CMakeLists.txt)
+ 
+diff -urp q4wine-0.120/src/main.cpp q4wine-0.120-qtsapp/src/main.cpp
+--- q4wine-0.120/src/main.cpp	2010-10-01 13:48:46.000000000 +0700
++++ q4wine-0.120-qtsapp/src/main.cpp	2010-11-10 10:34:04.444618395 +0600
+@@ -40,7 +40,7 @@
+ 
+ #include "db.h"
+ 
+-#include "qtsingleapplication.h"
++#include "QtSingleApplication"
+ 
+ //q4wine lib
+ #include "q4wine-lib.h"
+diff -urp q4wine-0.120/src/q4wine-gui/CMakeLists.txt q4wine-0.120-qtsapp/src/q4wine-gui/CMakeLists.txt
+--- q4wine-0.120/src/q4wine-gui/CMakeLists.txt	2010-10-01 13:48:46.000000000 +0700
++++ q4wine-0.120-qtsapp/src/q4wine-gui/CMakeLists.txt	2010-11-10 10:32:24.507202686 +0600
+@@ -182,12 +182,12 @@ install(FILES ${QM_I18N} DESTINATION ${C
+ ADD_EXECUTABLE( q4wine ${Q4WINE_GUI_SOURCES} ${Q4WINE_GUI_HEADERS} ${Q4WINE_GUI_UI_HEADERS} ${Q4WINE_GUI_MOC_SOURCES} ${RCC_SRCS} ${QM_I18N} ${PLUGINS_GUI_SOURCES} ${PLUGINS_GUI_HEADERS} ${PLUGINS_GUI_UI_HEADERS} ${PLUGINS_GUI_MOC_SOURCES})
+ 
+ IF (${CMAKE_SYSTEM_NAME} MATCHES Linux)
+-    TARGET_LINK_LIBRARIES( q4wine ${QT_LIBRARIES} q4wine-core qtsingleapp)
++    TARGET_LINK_LIBRARIES( q4wine ${QT_LIBRARIES} q4wine-core ${QTSINGLEAPPLIB})
+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES Linux)
+ 
+ IF (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+     SET(BSD_LIBS -lkvm)
+-    TARGET_LINK_LIBRARIES( q4wine ${QT_LIBRARIES} ${BSD_LIBS} q4wine-core qtsingleapp)
++    TARGET_LINK_LIBRARIES( q4wine ${QT_LIBRARIES} ${BSD_LIBS} q4wine-core ${QTSINGLEAPPLIB})
+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+ 
+ install(TARGETS q4wine DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+diff -urp q4wine-0.120/src/q4wine-lib/CMakeLists.txt q4wine-0.120-qtsapp/src/q4wine-lib/CMakeLists.txt
+--- q4wine-0.120/src/q4wine-lib/CMakeLists.txt	2010-10-01 13:48:46.000000000 +0700
++++ q4wine-0.120-qtsapp/src/q4wine-lib/CMakeLists.txt	2010-11-10 10:32:54.675592635 +0600
+@@ -11,7 +11,7 @@ SET ( Q4WINE_HEADERS_DIR
+     ${CMAKE_SOURCE_DIR}/src/q4wine-gui/widgets
+     ${CMAKE_SOURCE_DIR}/src/q4wine-gui/widgets/appdb
+     ${CMAKE_SOURCE_DIR}/src/plugins
+-    ${CMAKE_SOURCE_DIR}/src/qtsingleapplication
++    ${QTSINGLEAPPLIB_INCLUDE_DIR}
+ )
+ 
+ INCLUDE_DIRECTORIES( ${Q4WINE_HEADERS_DIR} ${CMAKE_BINARY_DIR} )
diff --git a/q4wine.spec b/q4wine.spec
index e42c083..ca6c062 100644
--- a/q4wine.spec
+++ b/q4wine.spec
@@ -1,15 +1,17 @@
 Name:           q4wine
 Version:        0.120
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Qt4 GUI for wine
 
 Group:          Applications/Emulators
 License:        GPLv3
 URL:            http://q4wine.brezblock.org.ua/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         q4wine-0.120-qtsingleapp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel cmake
+BuildRequires:  qtsingleapplication-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fuseiso icoutils
 Requires:       wine-core fuseiso icoutils
@@ -33,6 +35,7 @@ General features:
 
 %prep
 %setup -q
+%patch0 -p1 -b .qtsingleapp
 
 %build
 mkdir -p %{_target_platform}
@@ -72,6 +75,9 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/q4wine
 
 %changelog
+* Wed Nov 10 2010 Dmitrij S. Kryzhevich <krege at land.ru> 0.120-5
+- Use system qtsingleapplication.
+
 * Mon Nov 01 2010 Dmitrij S. Kryzhevich <krege at land.ru> 0.120-4
 - Add ExclusiveArch, there no wine for non *86 archs.