Merge branch 'fix_test_dependencies' into 'master'

[telepathy-qt] Remove extra dependencies from the tests. Contributes to JB#54110

See merge request mer-core/telepathy-qt!6

rpm/0001-telepathy-qt-Install-tests.patch → rpm/0001-Install-tests.patch

@@ -1,7 +1,7 @@
-From c62211b97821cae101ba54a70f1f28d527f95699 Mon Sep 17 00:00:00 2001
+From b4435ce7570a8148e9d5251e1096846672528c2d Mon Sep 17 00:00:00 2001
 From: Robin Burchell <robin+git@viroteck.net>
 Date: Wed, 28 Aug 2013 22:33:34 +0000
-Subject: [PATCH 1/2] [telepathy-qt] Install tests.
+Subject: [PATCH 1/3] Install tests.
 
 ---
  cmake/modules/TpQtMacros.cmake                |  1 +
@@ -156,5 +156,5 @@ index 73ff4000..2077e301 100644
 +# Add Nemo install target
 +INSTALL(TARGETS tp-glib-tests LIBRARY DESTINATION ${NEMO_TESTS_DIR_LIB})
 -- 
-2.20.1
+2.30.2
 

rpm/0002-Remove-assert-which-appears-invalid-for-conference-c.patch

@@ -1,7 +1,7 @@
-From 7af81a3bafd595072a685301e76a3651d429b9f9 Mon Sep 17 00:00:00 2001
+From ccf1643b5a24e984fac696277240ac903098a370 Mon Sep 17 00:00:00 2001
 From: Martin Jones <martin.jones@jollamobile.com>
 Date: Fri, 22 Apr 2016 11:40:39 +0000
-Subject: [PATCH 2/2] Remove assert which appears invalid for conference call.
+Subject: [PATCH 2/3] Remove assert which appears invalid for conference call.
  Contributes to JB#4743
 
 ---
@@ -24,5 +24,5 @@ index 2b7cde55..3a4d349a 100644
              warning().nospace() << "Getting conference channel removed actor "
                  "failed with " << pc->errorName() << ":" <<
 -- 
-2.20.1
+2.30.2
 

rpm/0003-Use-python3-on-tests-accountmanager.patch

@@ -0,0 +1,22 @@
+From 353e0e595aedaa7c93d826754579e744c336ed42 Mon Sep 17 00:00:00 2001
+From: Pekka Vuorela <pekka.vuorela@jolla.com>
+Date: Fri, 30 Apr 2021 12:46:38 +0300
+Subject: [PATCH 3/3] Use python3 on tests' accountmanager
+
+---
+ tests/lib/python/account-manager.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/lib/python/account-manager.py b/tests/lib/python/account-manager.py
+index cad1fc42..1956a6aa 100755
+--- a/tests/lib/python/account-manager.py
++++ b/tests/lib/python/account-manager.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ #
+ # A small implementation of a Telepathy AccountManager.
+
+-- 
+2.30.2
+

rpm/telepathy-qt5.spec

@@ -2,7 +2,6 @@ Name:       telepathy-qt5
 Summary:    Qt 5 Telepathy library
 Version:    0.9.8
 Release:    1
-Group:      System/Libraries
 License:    GPLv2
 URL:        http://telepathy.freedesktop.org/wiki/
 Source0:    http://telepathy.freedesktop.org/releases/telepathy-qt/%{name}-%{version}.tar.gz
@@ -11,8 +10,9 @@ Source2:    mktests.sh.in
 Source3:    runDbusTest.sh.in
 Source4:    runTest.sh.in
 
-Patch0:     0001-telepathy-qt-Install-tests.patch
+Patch0:     0001-Install-tests.patch
 Patch1:     0002-Remove-assert-which-appears-invalid-for-conference-c.patch
+Patch2:     0003-Use-python3-on-tests-accountmanager.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -37,7 +37,6 @@ Qt-based library for Telepathy components.
 
 %package devel
 Summary:    Development files for %{name}
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -47,7 +46,6 @@ that use %{name}.
 
 %package farstream
 Summary:    Qt 5 Telepathy/Farstream integration
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   telepathy-qt5 = %{version}
 Requires(post): /sbin/ldconfig
@@ -61,7 +59,6 @@ which implements media stream using gstreamer and Farstream.
 
 %package farstream-devel
 Summary:    Development files for telepathy-qt5-farstream
-Group:      Development/Libraries
 Requires:   %{name}-farstream = %{version}-%{release}
 Requires:   telepathy-qt5-devel = %{version}
 Requires:   telepathy-farstream-devel
@@ -74,20 +71,15 @@ that use telepathy-qt5-farstream.
 
 %package tests
 Summary:    Automated tests for %{name}
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 Requires:   %{name} = %{version}
-Requires:   dbus-python
-Requires:   pygobject2
 
 %description tests
 This package contains automated tests and tests.xml
 
 
 %prep
-%setup -q -n %{name}-%{version}/telepathy-qt
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n %{name}-%{version}/telepathy-qt
 
 %build
 %__cp $RPM_SOURCE_DIR/INSIGNIFICANT tests/