[libconnman-qt] Respect arch specific lib dir. JB#50027

sailfishos · May 28, 2020 · 06397e1 · 06397e1
1 parent 60d14a5
commit 06397e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/libconnman-qt/libconnman-qt.pro b/libconnman-qt/libconnman-qt.pro
@@ -92,7 +92,7 @@ SOURCES += \
     vpnmanager.cpp \
     vpnmodel.cpp
 
-target.path = $$INSTALL_ROOT$$PREFIX/lib
+target.path = $$[QT_INSTALL_LIBS]
 
 headers.files = $$PUBLIC_HEADERS
 

diff --git a/rpm/connman-qt5.spec b/rpm/connman-qt5.spec
@@ -2,7 +2,6 @@ Name:       connman-qt5
 Summary:    Qt bindings for connman
 Version:    1.2.32
 Release:    1
-Group:      System/GUI/Other
 License:    ASL 2.0
 URL:        https://git.sailfishos.org/mer-core/libconnman-qt
 Source0:    %{name}-%{version}.tar.bz2
@@ -67,11 +66,11 @@ rm -rf %{buildroot}
 
 %files declarative
 %defattr(-,root,root,-)
-%{_usr}/lib/qt5/qml/MeeGo/Connman
+%{_libdir}/qt5/qml/MeeGo/Connman
 
 %files devel
 %defattr(-,root,root,-)
-%{_usr}/include/connman-qt5
-%{_usr}/lib/pkgconfig/connman-qt5.pc
-%{_usr}/lib/libconnman-qt5.prl
-%{_usr}/lib/libconnman-qt5.so
+%{_includedir}/connman-qt5
+%{_libdir}/pkgconfig/connman-qt5.pc
+%{_libdir}/libconnman-qt5.prl
+%{_libdir}/libconnman-qt5.so