From 1965f9d956016f03f87dd8c38d075b929cb6c16b Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@qinetic.com.au>
Date: Mon, 10 Dec 2018 15:48:17 +1000
Subject: [PATCH] [transfer-engine] Properly link package and .pc version.
 Contributes to JB#38551

---
 lib/lib.pro                   | 11 +++++++++--
 lib/nemotransferengine-qt5.pc | 11 -----------
 lib/nemotransferengine.pc     | 11 -----------
 rpm/transfer-engine-qt5.spec  |  6 ++----
 4 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 lib/nemotransferengine-qt5.pc
 delete mode 100644 lib/nemotransferengine.pc

diff --git a/lib/lib.pro b/lib/lib.pro
index b120f52..1a00c50 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = nemotransferengine-qt5
 DEPENDPATH += .
 INCLUDEPATH += .
-CONFIG += shared link_pkgconfig
+CONFIG += shared qt create_pc create_prl no_install_prl link_pkgconfig
 QT += dbus
 PKGCONFIG += quillmetadata-qt5
 
@@ -36,7 +36,7 @@ HEADERS += \
 SOURCES += \
    transferengineinterface.cpp
 
-OTHER_FILES += nemotransfernegine-qt5.pc nemotransferengine-plugin-qt5.prf
+OTHER_FILES += nemotransferengine-qt5.pc nemotransferengine-plugin-qt5.prf
 
 headers.files = $$HEADERS
 headers.path = /usr/include/TransferEngine-qt5
@@ -49,5 +49,12 @@ pkgconfigpc.files = nemotransferengine-qt5.pc
 prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
 prf.files = nemotransferengine-plugin-qt5.prf
 
+QMAKE_PKGCONFIG_NAME = lib$$TARGET
+QMAKE_PKGCONFIG_DESCRIPTION = Nemo transfer engine library for share plugins and transfer engine API
+QMAKE_PKGCONFIG_LIBDIR = $$target.path
+QMAKE_PKGCONFIG_INCDIR = $$headers.path
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5DBus
+QMAKE_PKGCONFIG_VERSION = $$VERSION
 
 INSTALLS += target headers prf pkgconfigpc
diff --git a/lib/nemotransferengine-qt5.pc b/lib/nemotransferengine-qt5.pc
deleted file mode 100644
index d51bab7..0000000
--- a/lib/nemotransferengine-qt5.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/TransferEngine-qt5
-
-Name: libnemotransferengine-qt5
-Description: Nemo transfer engine library for share plugins and transfer engine API
-Version: 0.0.1
-Requires: Qt5Core Qt5DBus
-Libs: -L${libdir} -lnemotransferengine-qt5
-Cflags: -I${includedir}
diff --git a/lib/nemotransferengine.pc b/lib/nemotransferengine.pc
deleted file mode 100644
index 3ee0d53..0000000
--- a/lib/nemotransferengine.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/TransferEngine
-
-Name: libnemotransferengine
-Description: Nemo transfer engine library for share plugins and transfer engine API
-Version: 0.0.1
-Requires: QtCore QtDBus
-Libs: -L${libdir} -lnemotransferengine
-Cflags: -I${includedir}
diff --git a/rpm/transfer-engine-qt5.spec b/rpm/transfer-engine-qt5.spec
index afe91dd..32e2571 100644
--- a/rpm/transfer-engine-qt5.spec
+++ b/rpm/transfer-engine-qt5.spec
@@ -110,10 +110,8 @@ Documentation for Nemo TransferEngine
 %setup -q -n %{name}-%{version}
 
 %build
-
-%qmake5
-
-make %{?jobs:-j%jobs}
+%qmake5 "VERSION=%{version}"
+make %{?_smp_mflags}
 make docs
 
 %install