Merge branch 'jb50027' into 'master'

[aarch64] Do not hardcode lib dir. Contributes to JB#50027 See merge request mer-core/nemo-qml-plugin-connectivity!26
sailfishos · Jun 10, 2020 · 2410ed6 · 2410ed6
2 parents 0e56c69 + 925a4ad
commit 2410ed6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/rpm/nemo-qml-plugin-connectivity.spec b/rpm/nemo-qml-plugin-connectivity.spec
@@ -1,10 +1,9 @@
 Name:       nemo-qml-plugin-connectivity
-Summary:    Connectivity plugin for Nemo Mobile
+Summary:    Connectivity plugin for Sailfish OS
 Version:    0.1
 Release:    1
-Group:      System/Libraries
 License:    BSD
-URL:        https://git.merproject.org/mer-core/nemo-qml-plugin-connectivity
+URL:        https://git.sailfishos.org/mer-core/nemo-qml-plugin-connectivity
 Source0:    %{name}-%{version}.tar.bz2
 Requires:   connman-qt5 >= 1.2.10
 BuildRequires:  pkgconfig(Qt5Core)
@@ -20,7 +19,6 @@ BuildRequires:  pkgconfig(qofono-qt5)
 
 %package devel
 Summary:    Nemo Connectivity development files
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   pkgconfig(Qt5DBus)
 Requires:   pkgconfig(connman-qt5) >= 1.2.16

diff --git a/src/nemo-connectivity/nemo-connectivity.pro b/src/nemo-connectivity/nemo-connectivity.pro
@@ -33,9 +33,9 @@ HEADERS += $$PUBLIC_HEADERS \
     mobiledataconnection_p.h \
 
 public_headers.files = $$PUBLIC_HEADERS
-public_headers.path = /usr/include/nemo-connectivity
+public_headers.path = $$PREFIX/include/nemo-connectivity
 
-target.path = /usr/lib
+target.path = $$[QT_INSTALL_LIBS]
 
 QMAKE_PKGCONFIG_NAME = nemoconnectivity
 QMAKE_PKGCONFIG_DESCRIPTION = Nemo library for Connectivity