Merge branch 'jb49681' into 'master'

Use macros, not hardcoded paths. See merge request mer-core/transfer-engine!15
sailfishos · Jun 1, 2020 · 96fff9d · 96fff9d
2 parents a6dc61a + b6e4271
commit 96fff9d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/lib/lib.pro b/lib/lib.pro
@@ -40,11 +40,11 @@ SOURCES += \
 OTHER_FILES += nemotransferengine-qt5.pc nemotransferengine-plugin-qt5.prf
 
 headers.files = $$HEADERS
-headers.path = /usr/include/TransferEngine-qt5
+headers.path = $$[QT_INSTALL_PREFIX]/include/TransferEngine-qt5
 
-target.path = /usr/lib
+target.path = $$[QT_INSTALL_LIBS]
 
-pkgconfigpc.path = /usr/lib/pkgconfig/
+pkgconfigpc.path = $$[QT_INSTALL_LIBS]/pkgconfig/
 pkgconfigpc.files = nemotransferengine-qt5.pc
 
 prf.path = $$[QT_INSTALL_DATA]/mkspecs/features

diff --git a/lib/nemotransferengine-plugin-qt5.prf b/lib/nemotransferengine-plugin-qt5.prf
@@ -7,7 +7,7 @@
     CONFIG += qt plugin
     QT += network
 
-    LIBTRANSFERENGINE_INC_DIR = /usr/include/TransferEngine-qt5
+    LIBTRANSFERENGINE_INC_DIR = $$[QT_INSTALL_PREFIX]/include/TransferEngine-qt5
 
     INCLUDEPATH += $${LIBTRANSFERENGINE_INC_DIR}
     DEPENDPATH  += $${LIBTRANSFERENGINE_INC_DIR}
@@ -16,7 +16,7 @@
     HEADERS += $${INCLUDEPATH}/transferplugininterface.h
     HEADERS += $${INCLUDEPATH}/mediatransferinterface.h
 
-    LIBTRANSFERENGINE_LIB_DIR = /usr/lib
+    LIBTRANSFERENGINE_LIB_DIR = $$[QT_INSTALL_LIBS]
     unix: QMAKE_FLAGS += $${QMAKE_LFLAGS_RPATH}$${LIBTRANSFERENGINE_LIB_DIR}
     LIBS += -L$${LIBTRANSFERENGINE_LIB_DIR}
     qtAddLibrary(nemotransferengine-qt5)

diff --git a/lib/nemotransferengine-plugin.prf b/lib/nemotransferengine-plugin.prf
@@ -7,7 +7,7 @@
     CONFIG += qt plugin
     QT += network
 
-    LIBTRANSFERENGINE_INC_DIR = /usr/include/TransferEngine   
+    LIBTRANSFERENGINE_INC_DIR = $$[QT_INSTALL_PREFIX]/include/TransferEngine
 
     INCLUDEPATH += $${LIBTRANSFERENGINE_INC_DIR}
     DEPENDPATH  += $${LIBTRANSFERENGINE_INC_DIR}
@@ -16,7 +16,7 @@
     HEADERS += $${INCLUDEPATH}/transferplugininterface.h
     HEADERS += $${INCLUDEPATH}/mediatransferinterface.h
 
-    LIBTRANSFERENGINE_LIB_DIR = /usr/lib
+    LIBTRANSFERENGINE_LIB_DIR = $$[QT_INSTALL_LIBS]
     unix: QMAKE_FLAGS += $${QMAKE_LFLAGS_RPATH}$${LIBTRANSFERENGINE_LIB_DIR}
     LIBS += -L$${LIBTRANSFERENGINE_LIB_DIR}
     qtAddLibrary(nemotransferengine)

diff --git a/rpm/nemo-transferengine-qt5.spec b/rpm/nemo-transferengine-qt5.spec
@@ -2,7 +2,6 @@ Name:    nemo-transferengine-qt5
 Version: 1.0.0
 Release: 0
 Summary: Transfer Engine for uploading media content and tracking transfers.
-Group:   System Environment/Daemon
 License: LGPLv2
 URL:     https://git.sailfishos.org/mer-core/transfer-engine
 Source0: %{name}-%{version}.tar.gz
@@ -23,6 +22,7 @@ BuildRequires: qt5-qttools-qthelp-devel
 BuildRequires: qt5-plugin-platform-minimal
 BuildRequires: qt5-plugin-sqldriver-sqlite
 BuildRequires: pkgconfig(qt5-boostable)
+BuildRequires: systemd
 Requires: libnemotransferengine-qt5 = %{version}
 Provides: nemo-transferengine > 0.0.19
 Obsoletes: nemo-transferengine <= 0.0.19
@@ -32,7 +32,7 @@ Obsoletes: nemo-transferengine <= 0.0.19
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/systemd/user/transferengine.service
+%{_userunitdir}/transferengine.service
 %dir %{_datadir}/nemo-transferengine
 %{_bindir}/nemo-transfer-engine
 %{_datadir}/dbus-1/services/org.nemo.transferengine.service
@@ -41,7 +41,6 @@ Obsoletes: nemo-transferengine <= 0.0.19
 
 %package -n libnemotransferengine-qt5
 Summary: Transfer engine library.
-Group: Development/Libraries
 
 %description -n libnemotransferengine-qt5
 %{summary}
@@ -53,7 +52,6 @@ Group: Development/Libraries
 
 %package -n libnemotransferengine-qt5-devel
 Summary: Development headers for transfer engine library.
-Group: Development/Libraries
 Requires: libnemotransferengine-qt5 = %{version}
 
 %description -n libnemotransferengine-qt5-devel

diff --git a/src/src.pro b/src/src.pro
@@ -62,6 +62,8 @@ HEADERS += \
     transferengine.h \
     transferengine_p.h
 
+DEFINES += SHARE_PLUGINS_PATH=\"\\\"$$[QT_INSTALL_LIBS]/nemo-transferengine/plugins\\\"\"
+
 SERVICE_FILE += ../dbus/org.nemo.transferengine.service
 OTHER_FILES +=  $$SERVICE_FILE \
                 ../dbus/org.nemo.transferengine.xml

diff --git a/src/transferengine.cpp b/src/transferengine.cpp
@@ -47,7 +47,6 @@
 
 #include <Accounts/Manager>
 
-#define SHARE_PLUGINS_PATH "/usr/lib/nemo-transferengine/plugins"
 #define CONFIG_PATH "/usr/share/nemo-transferengine/nemo-transfer-engine.conf"
 #define FILE_WATCHER_TIMEOUT 5000
 #define ACTIVITY_MONITOR_TIMEOUT 1*60*1000 // 1 minute in ms