Merge branch 'pack' into 'master'

Refine systemd unit install and test cleanup

See merge request mer-core/sensorfw!57

debian/rules

@@ -48,7 +48,7 @@ configure-stamp: builddir
 	dh_testdir
 
 	# Add here commands to configure the package.
-	cd $(BUILD_DIR) && qmake $(QMAKECONFIG) CONFIG+="configs" CONFIG+="autohybris" "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
+	cd $(BUILD_DIR) && qmake $(QMAKECONFIG) CONFIG+="configs" CONFIG+="autohybris" CONFIG+="systemdunit" "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
 	export LD_RUN_PATH=/usr/lib/sensord-qt5/
 
 	touch configure-stamp

rpm/sensorfw-qt5.spec

@@ -7,7 +7,6 @@ URL:        https://git.sailfishos.org/mer-core/sensorfw
 Source0:    %{name}-%{version}.tar.bz2
 Source1:    sensorfwd.service
 Source2:    sensorfw-qt5-hybris.inc
-Requires:   qt5-qtcore
 Requires:   sensord-configs
 Requires:   systemd
 Requires(preun): systemd
@@ -34,9 +33,9 @@ Sensor Framework provides an interface to hardware sensor drivers through logica
 %package devel
 Summary:    Sensor framework daemon libraries development headers
 Requires:   %{name} = %{version}-%{release}
-Requires:   qt5-qtcore-devel
-Requires:   qt5-qtdbus-devel
-Requires:   qt5-qtnetwork-devel
+Requires:   pkgconfig(Qt5Core)
+Requires:   pkgconfig(Qt5DBus)
+Requires:   pkgconfig(Qt5Network)
 
 %description devel
 Development headers for sensor framework daemon and libraries.
@@ -45,9 +44,9 @@ Development headers for sensor framework daemon and libraries.
 %package tests
 Summary:    Unit test cases for sensord
 Requires:   %{name} = %{version}-%{release}
-Requires:   qt5-qttest-devel
+Requires:   pkgconfig(Qt5Test)
 Requires:   testrunner-lite
-Requires:   python
+Requires:   python(abi) > 3.0
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 

sensorfw.pro

@@ -96,7 +96,11 @@ contains(CONFIG,hybris) {
     SENSORDCONFIGFILES.files += config/20-sensors-default.conf
     SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
     INSTALLS += SENSORDCONFIGFILES
+}
 
+contains(CONFIG,systemdunit) {
+    # Install service files through packaging to take into account
+    # units file location unless called with CONFIG+=systemdunit
     SENSORSYSTEMD.files = rpm/sensorfwd.service
     SENSORSYSTEMD.path = /lib/systemd/system
     INSTALLS += SENSORSYSTEMD

tests/deadclient/sensord-deadclienttest.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 ##
 ## Copyright (C) 2009-2010 Nokia Corporation
 ##