# last commit to qtsingleapplication subdir in
# https://qt.gitorious.org/qt-solutions/qt-solutions/
-%define commit 841982ceec9d30a7ab7324979a0fd5c9c36fd121
+%define commit ad9bc4600ce769a8b3ad10910803cd555811b70c
Summary: Qt library to start applications only once per user
Name: QtSingleApplication
Version: 2.6.1
-Release: 2
+Release: 2.1
License: GPL v3 or LGPL v2 with exceptions
Group: Libraries
-# git clone git@gitorious.org:qt-solutions/qt-solutions.git
-# git checkout %{commit}
-# tar -cjf QtSingleApplication-%{version}.tar.bz2 -C qt-solutions/qtsingleapplication .
-Source0: %{name}-%{version}.tar.bz2
-# Source0-md5: 2442ba5536b99b4b9144bd33ea23cb17
+Source0: https://github.com/qtproject/qt-solutions/archive/%{commit}/%{name}-%{commit}.tar.gz
+# Source0-md5: 07f01898ad475c5cded2968d25bee85c
Source1: qtsingleapplication.prf
Source2: qtsinglecoreapplication.prf
Patch0: qtsingleapplication-build.diff
Patch1: qtlockedfile.patch
Patch2: clementine.patch
+Patch3: version.patch
URL: http://doc.qt.digia.com/solutions/4/qtsingleapplication/qtsingleapplication.html
BuildRequires: libstdc++-devel
%if %{with qt4}
%prep
%setup -qc
+mv qt-solutions-*/qtsingleapplication/* .
%patch0 -p0
%patch1 -p0
%patch2 -p1
+%patch3 -p1
# We already disabled bundling this external library.
# But just to make sure:
+target.path = $$DESTDIR
+INSTALLS += target
diff -rupN common.pri.old common.pri
---- common.pri.old 2014-08-14 22:46:46.597411107 +0200
-+++ common.pri 2014-08-14 22:47:33.676859489 +0200
-@@ -1,6 +1,7 @@
- exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib
- TEMPLATE += fakelib
--QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
-+QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6)
-+QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6)
+--- common.pri.old 2015-09-13 18:29:19.955577604 +0200
++++ common.pri 2015-09-13 18:32:21.054587906 +0200
+@@ -5,10 +5,12 @@ greaterThan(QT_MAJOR_VERSION, 5)|\
+ if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
+ if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
+ QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
++ QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-head)
+ } else {
+ QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
++ QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-head)
+ }
TEMPLATE -= fakelib
+
QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
-+QTSINGLECOREAPPLICATION_LIBDIR = $$PWD/lib
-unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
++QTSINGLECOREAPPLICATION_LIBDIR = $$PWD/lib
diff -rupN qtsingleapplication.pro.old qtsingleapplication.pro
--- qtsingleapplication.pro.old 2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication.pro 2010-07-21 22:09:10.000000000 -0400
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
-DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
LIBS *= -lQtSolutions_SingleApplication-2.6
+QT *= widgets
QT *= network
+CONFIG *= qtlockedfile
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
-DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
LIBS *= -lQtSolutions_SingleCoreApplication-2.6
QT *= network
--- /dev/null
+use versioned soname
+
+--- ./common.pri.orig 2016-04-13 01:52:30.218251289 +0300
++++ ./common.pri 2016-04-13 01:52:30.218251289 +0300
+@@ -4,11 +4,11 @@
+ greaterThan(QT_MAJOR_VERSION, 5)|\
+ if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
+ if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
+- QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
+- QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-head)
++ QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-2.6)
++ QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-2.6)
+ } else {
+- QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
+- QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-head)
++ QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6)
++ QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6)
+ }
+ TEMPLATE -= fakelib
+