rdieter pushed to qtsingleapplication (f21). ".prf: use versioned libs for linking"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed May 6 22:36:45 UTC 2015


From a72193a74741e555d7600e7ddae7f7fbe56a7eab Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 6 May 2015 12:57:23 -0500
Subject: .prf: use versioned libs for linking


diff --git a/qtsingleapplication.prf b/qtsingleapplication.prf
index d6da0f9..3171424 100644
--- a/qtsingleapplication.prf
+++ b/qtsingleapplication.prf
@@ -1,5 +1,9 @@
 INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+greaterThan(QT_MAJOR_VERSION, 4) {
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication-2.6
+QT *= widgets
+} else {
 LIBS *= -lQtSolutions_SingleApplication-2.6
+}
 QT *= network
-greaterThan(QT_MAJOR_VERSION, 4): QT *= widgets
 CONFIG *= qtlockedfile
diff --git a/qtsingleapplication.spec b/qtsingleapplication.spec
index 809d9fe..5da46cf 100644
--- a/qtsingleapplication.spec
+++ b/qtsingleapplication.spec
@@ -3,7 +3,7 @@
 Summary:    Qt library to start applications only once per user
 Name:       qtsingleapplication
 Version:    2.6.1
-Release:    16%{?dist}
+Release:    17%{?dist}
 
 License:    GPLv3 or LGPLv2 with exceptions
 URL:        http://doc.qt.digia.com/solutions/4/qtsingleapplication/qtsingleapplication.html
@@ -229,6 +229,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed May 06 2015 Rex Dieter <rdieter at fedoraproject.org> 2.6.1-17
+- .prf: use versioned libs for linking
+
 * Fri May 01 2015 Rex Dieter <rdieter at fedoraproject.org> 2.6.1-16
 - .prf: use QT_INSTALL_HEADERS instead, drop DEPENDPATH
 
diff --git a/qtsinglecoreapplication.prf b/qtsinglecoreapplication.prf
index c400d53..fa3a171 100644
--- a/qtsinglecoreapplication.prf
+++ b/qtsinglecoreapplication.prf
@@ -1,3 +1,8 @@
 INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+greaterThan(QT_MAJOR_VERSION, 4) {
+LIBS *= -lQt$${QT_MAJOR_VERSION}Solutions_SingleCoreApplication-2.6
+QT *= widgets
+} else {
 LIBS *= -lQtSolutions_SingleCoreApplication-2.6
+}
 QT *= network
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/commit/?h=f21&id=a72193a74741e555d7600e7ddae7f7fbe56a7eab


More information about the scm-commits mailing list